2001-11-21 Chip Salzenberg <chip@pobox.com>

	* support/nfs/exports.c (parseopts): Accept old-style
	"crossmnt" option, for old xtabs.

diff --git a/ChangeLog b/ChangeLog
index 10b2a1347a5d8183f49143b2c83f785d6a948b09..d82c70a4eb9a908ad0c1ac77482ea7a69d0eab14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
        * support/nfs/exports.c (efname): Added: current exports file name.
        (setnfsexportent): Set it.
        (endnfsexportent, parseopts, getexport, syntaxerr): Use it.
+       (parseopts): Accept old-style "crossmnt" option, for old xtabs.
 
 2001-10-11  Chip Salzenberg  <chip@pobox.com>
 

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 5a8e7e9982fef7181b02f63e9e663387296f0e2a..0c252779048d36e9561c09444b76c834a8ba007d 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -309,6 +309,10 @@ parseopts(char *cp, struct exportent *ep)
                        ep->e_flags |= NFSEXP_CROSSMNT;
                else if (!strcmp(opt, "hide"))
                        ep->e_flags &= ~NFSEXP_CROSSMNT;
+               else if (!strcmp(opt, "crossmnt"))              /* old style */
+                       ep->e_flags |= NFSEXP_CROSSMNT;
+               else if (!strcmp(opt, "nocrossmnt"))            /* old style */
+                       ep->e_flags &= ~NFSEXP_CROSSMNT;
                else if (!strcmp(opt, "wdelay"))
                        ep->e_flags |= NFSEXP_GATHERED_WRITES;
                else if (!strcmp(opt, "no_wdelay"))