Change CROSSMNT to CROSSMOUNT

diff --git a/ChangeLog b/ChangeLog
index 00e380e94de469724cef18aafdfccccef66db84b..81ccf88bc851d8f9e51c1175a44ff5fafcc0ea89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-04 NeilBrown <neilb@cse.unsw.edu.au>
+       * support/include/nfs/export.h, support/nfs/exports.c,
+       utils/exportfs/exports.c, utils/mountd/mountd.c:  change
+       NFSEXP_CROSSMNT to NFSEXP_CROSSMOUNT to avoid confusion with older
+       meaning. Also remove meaningless
+       NFSEXP_{UIDMAP,KERBEROS,SUNSECURE}
+       
 2003-08-04 NeilBrown <neilb@cse.unsw.edu.au>
        * support/export/xtab.c, support/include/nfslib.h,
        support/nfs/cacheio.c, support/nfs/nfssvc.c,

diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index 9c73aaa2d3eb4b2fe0baafed51e5fcd0beb3a7f6..f7a99bab964b34ccf779f28b095c4986b303958e 100644 (file)
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -17,14 +17,12 @@
 #define NFSEXP_ALLSQUASH       0x0008
 #define NFSEXP_ASYNC           0x0010
 #define NFSEXP_GATHERED_WRITES 0x0020
-#define NFSEXP_UIDMAP          0x0040
-#define NFSEXP_KERBEROS                0x0080          /* not available */
-#define NFSEXP_SUNSECURE       0x0100
+/* 40, 80, 100 unused */
 #define NFSEXP_NOHIDE          0x0200
 #define NFSEXP_NOSUBTREECHECK  0x0400
 #define NFSEXP_NOAUTHNLM       0x0800
 #define NFSEXP_FSID            0x2000
-#define        NFSEXP_CROSSMNT         0x4000
+#define        NFSEXP_CROSSMOUNT       0x4000
 #define NFSEXP_NOACL           0x8000 /* reserved for possible ACL related use */
 #define NFSEXP_ALLFLAGS                0xFFFF
 

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 4d8665c6be475ba905435fa2074078194f200909..c46c7a99655b921f24855e1bee13f2f306742f77 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -173,7 +173,7 @@ putexportent(struct exportent *ep)
                                "" : "no_");
        fprintf(fp, "%shide,", (ep->e_flags & NFSEXP_NOHIDE)?
                                "no" : "");
-       fprintf(fp, "%scrossmnt,", (ep->e_flags & NFSEXP_CROSSMNT)?
+       fprintf(fp, "%scrossmnt,", (ep->e_flags & NFSEXP_CROSSMOUNT)?
                                "" : "no");
        fprintf(fp, "%ssecure,", (ep->e_flags & NFSEXP_INSECURE_PORT)?
                                "in" : "");
@@ -347,9 +347,9 @@ parseopts(char *cp, struct exportent *ep, int warn)
                else if (!strcmp(opt, "hide"))
                        ep->e_flags &= ~NFSEXP_NOHIDE;
                else if (!strcmp(opt, "crossmnt"))
-                       ep->e_flags |= NFSEXP_CROSSMNT;
+                       ep->e_flags |= NFSEXP_CROSSMOUNT;
                else if (!strcmp(opt, "nocrossmnt"))
-                       ep->e_flags &= ~NFSEXP_CROSSMNT;
+                       ep->e_flags &= ~NFSEXP_CROSSMOUNT;
                else if (!strcmp(opt, "wdelay"))
                        ep->e_flags |= NFSEXP_GATHERED_WRITES;
                else if (!strcmp(opt, "no_wdelay"))

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 6f2a60d7d4bddd20f321df402f281d6d8a68985a..290d8b25454b7317c3c323bb1f02b9964934bdb8 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -373,7 +373,7 @@ dump(int verbose)
                                c = dumpopt(c, "wdelay");
                        if (ep->e_flags & NFSEXP_NOHIDE)
                                c = dumpopt(c, "nohide");
-                       if (ep->e_flags & NFSEXP_CROSSMNT)
+                       if (ep->e_flags & NFSEXP_CROSSMOUNT)
                                c = dumpopt(c, "crossmnt");
                        if (ep->e_flags & NFSEXP_INSECURE_PORT)
                                c = dumpopt(c, "insecure");

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 6dbd224fc27af0e0422e0972d8ecf3599c415e0c..0b34617dbb41261b2f5920c80df7858699942da0 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -283,7 +283,7 @@ get_rootfh(struct svc_req *rqstp, dirpath *path, int *error, int v3)
                     p, strerror(errno));
                *error = NFSERR_NOENT;
        } else if (estb.st_dev != stb.st_dev
-                  /* && (!new_cache || !(exp->m_export.e_flags & NFSEXP_CROSSMNT)) */
+                  /* && (!new_cache || !(exp->m_export.e_flags & NFSEXP_CROSSMOUNT)) */
                ) {
                xlog(L_WARNING, "request to export directory %s below nearest filesystem %s",
                     p, exp->m_export.e_path);