diff options
| author | neilbrown <neilbrown> | 2003-08-06 05:23:13 +0000 |
|---|---|---|
| committer | neilbrown <neilbrown> | 2003-08-06 05:23:13 +0000 |
| commit | 9c8dfab04dcf5f5067061703d6cd08ee408eec8f (patch) | |
| tree | 8802d4207b2d416c52adb790f1a6a2742f3a1e1f | |
| parent | e09fbc8933961a0a774217ef32d73da373ddc670 (diff) | |
| download | nfs-utils-9c8dfab04dcf5f5067061703d6cd08ee408eec8f.tar.gz nfs-utils-9c8dfab04dcf5f5067061703d6cd08ee408eec8f.tar.xz nfs-utils-9c8dfab04dcf5f5067061703d6cd08ee408eec8f.zip | |
Change CROSSMNT to CROSSMOUNT
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | support/include/nfs/export.h | 6 | ||||
| -rw-r--r-- | support/nfs/exports.c | 6 | ||||
| -rw-r--r-- | utils/exportfs/exportfs.c | 2 | ||||
| -rw-r--r-- | utils/mountd/mountd.c | 2 |
5 files changed, 14 insertions, 9 deletions
@@ -1,4 +1,11 @@ 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, utils/exportfs/exportfs.c, utils/exportfs/exportfs.man, diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h index 9c73aaa..f7a99ba 100644 --- 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 4d8665c..c46c7a9 100644 --- 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 6f2a60d..290d8b2 100644 --- 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 6dbd224..0b34617 100644 --- 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); |