Make CROSSMNT distinct from NOHIDE

diff --git a/ChangeLog b/ChangeLog
index c181e21e53210e3e574263b0a4186925074ef428..1494b88bdda6761145ce8df44f174450483e0ee4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-21  NeilBrown <neilb@cse.unsw.edu.au>
+
+       * support/include/nfs/export.h: New CROSSMNT distinct from NOHIDE
+       * support/nfs/exports.c: Make CROSSMNT distinct from NOHIDE
+       * utils/exportfs/exportfs.c(dump): ditto
+       

 2003-05-21  NeilBrown <neilb@cse.unsw.edu.au>
 
        * support/export/hostname.c(get_reliable_hostbyaddr): new function
 2003-05-21  NeilBrown <neilb@cse.unsw.edu.au>
 
        * support/export/hostname.c(get_reliable_hostbyaddr): new function

diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index 344ece550f6ba7a425cc5868cb3253a6701f3d37..d79a179dcff17b1dbd1cb955a0958b62f08bdc4d 100644 (file)
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -20,10 +20,11 @@
 #define NFSEXP_UIDMAP          0x0040
 #define NFSEXP_KERBEROS                0x0080          /* not available */
 #define NFSEXP_SUNSECURE       0x0100
 #define NFSEXP_UIDMAP          0x0040
 #define NFSEXP_KERBEROS                0x0080          /* not available */
 #define NFSEXP_SUNSECURE       0x0100

-#define NFSEXP_CROSSMNT                0x0200
+#define NFSEXP_NOHIDE          0x0200

 #define NFSEXP_NOSUBTREECHECK  0x0400
 #define NFSEXP_NOAUTHNLM       0x0800
 #define NFSEXP_FSID            0x2000
 #define NFSEXP_NOSUBTREECHECK  0x0400
 #define NFSEXP_NOAUTHNLM       0x0800
 #define NFSEXP_FSID            0x2000

-#define NFSEXP_ALLFLAGS                0x3FFF
+#define        NFSEXP_CROSSMNT         0x4000
+#define NFSEXP_ALLFLAGS                0x7FFF

 
 #endif /* _NSF_EXPORT_H */
 
 #endif /* _NSF_EXPORT_H */

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 3d2395948edd80d6ec34793d395e82c6e41e8a54..dfb241e6fb498f459ea5d7b7e31e576a2dd41fd5 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -170,8 +170,10 @@ putexportent(struct exportent *ep)
        fprintf(fp, "%ssync,", (ep->e_flags & NFSEXP_ASYNC)? "a" : "");
        fprintf(fp, "%swdelay,", (ep->e_flags & NFSEXP_GATHERED_WRITES)?
                                "" : "no_");
        fprintf(fp, "%ssync,", (ep->e_flags & NFSEXP_ASYNC)? "a" : "");
        fprintf(fp, "%swdelay,", (ep->e_flags & NFSEXP_GATHERED_WRITES)?
                                "" : "no_");

-       fprintf(fp, "%shide,", (ep->e_flags & NFSEXP_CROSSMNT)?
+       fprintf(fp, "%shide,", (ep->e_flags & NFSEXP_NOHIDE)?

                                "no" : "");
                                "no" : "");

+       fprintf(fp, "%scrossmnt,", (ep->e_flags & NFSEXP_CROSSMNT)?
+                               "" : "no");

        fprintf(fp, "%ssecure,", (ep->e_flags & NFSEXP_INSECURE_PORT)?
                                "in" : "");
        fprintf(fp, "%sroot_squash,", (ep->e_flags & NFSEXP_ROOTSQUASH)?
        fprintf(fp, "%ssecure,", (ep->e_flags & NFSEXP_INSECURE_PORT)?
                                "in" : "");
        fprintf(fp, "%sroot_squash,", (ep->e_flags & NFSEXP_ROOTSQUASH)?


@@ -333,12 +335,12 @@ parseopts(char *cp, struct exportent *ep, int warn)
                        had_sync_opt = 1;
                        ep->e_flags |= NFSEXP_ASYNC;
                } else if (!strcmp(opt, "nohide"))
                        had_sync_opt = 1;
                        ep->e_flags |= NFSEXP_ASYNC;
                } else if (!strcmp(opt, "nohide"))

-                       ep->e_flags |= NFSEXP_CROSSMNT;
+                       ep->e_flags |= NFSEXP_NOHIDE;

                else if (!strcmp(opt, "hide"))
                else if (!strcmp(opt, "hide"))

-                       ep->e_flags &= ~NFSEXP_CROSSMNT;
-               else if (!strcmp(opt, "crossmnt"))              /* old style */
+                       ep->e_flags &= ~NFSEXP_NOHIDE;
+               else if (!strcmp(opt, "crossmnt"))

                        ep->e_flags |= NFSEXP_CROSSMNT;
                        ep->e_flags |= NFSEXP_CROSSMNT;

-               else if (!strcmp(opt, "nocrossmnt"))            /* old style */
+               else if (!strcmp(opt, "nocrossmnt"))

                        ep->e_flags &= ~NFSEXP_CROSSMNT;
                else if (!strcmp(opt, "wdelay"))
                        ep->e_flags |= NFSEXP_GATHERED_WRITES;
                        ep->e_flags &= ~NFSEXP_CROSSMNT;
                else if (!strcmp(opt, "wdelay"))
                        ep->e_flags |= NFSEXP_GATHERED_WRITES;

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 60f130e6f802bf1781a87d6bddfa99c0b3d05b41..05ace88959d221f25f80784b7adba03749ad8203 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -333,8 +333,10 @@ dump(int verbose)
                                c = dumpopt(c, "async");
                        if (ep->e_flags & NFSEXP_GATHERED_WRITES)
                                c = dumpopt(c, "wdelay");
                                c = dumpopt(c, "async");
                        if (ep->e_flags & NFSEXP_GATHERED_WRITES)
                                c = dumpopt(c, "wdelay");

-                       if (ep->e_flags & NFSEXP_CROSSMNT)
+                       if (ep->e_flags & NFSEXP_NOHIDE)

                                c = dumpopt(c, "nohide");
                                c = dumpopt(c, "nohide");

+                       if (ep->e_flags & NFSEXP_CROSSMNT)
+                               c = dumpopt(c, "crossmnt");

                        if (ep->e_flags & NFSEXP_INSECURE_PORT)
                                c = dumpopt(c, "insecure");
                        if (ep->e_flags & NFSEXP_ROOTSQUASH)
                        if (ep->e_flags & NFSEXP_INSECURE_PORT)
                                c = dumpopt(c, "insecure");
                        if (ep->e_flags & NFSEXP_ROOTSQUASH)