Make CROSSMNT distinct from NOHIDE

[nfs-utils.git] / support / nfs / exports.c

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 3c5b19881864249fa9910a070e720ab605fe8ce5..dfb241e6fb498f459ea5d7b7e31e576a2dd41fd5 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <errno.h>
 #include "nfslib.h"
 #include "exportfs.h"
 #include "xmalloc.h"
@@ -31,6 +32,8 @@
 #define EXPORT_DEFAULT_FLAGS   \
   (NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
 
+int export_errno;
+
 static char    *efname = NULL;
 static XFILE   *efp = NULL;
 static int     first;
@@ -101,6 +104,7 @@ getexportent(int fromkernel, int fromexports)
        }
        if (ok < 0) {
                xlog(L_ERROR, "expected client(options...)");
+               export_errno = EINVAL;
                return NULL;
        }
        first = 0;
@@ -114,6 +118,7 @@ getexportent(int fromkernel, int fromexports)
                *opt++ = '\0';
                if (!(sp = strchr(opt, ')')) || sp[1] != '\0') {
                        syntaxerr("bad option list");
+                       export_errno = EINVAL;
                        return NULL;
                }
                *sp = '\0';
@@ -122,6 +127,7 @@ getexportent(int fromkernel, int fromexports)
        }
        if (strlen(exp) >= sizeof(ee.e_hostname)) {
                syntaxerr("client name too long");
+               export_errno = EINVAL;
                return NULL;
        }
        strncpy(ee.e_hostname, exp, sizeof (ee.e_hostname) - 1);
@@ -164,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, "%shide,", (ep->e_flags & NFSEXP_CROSSMNT)?
+       fprintf(fp, "%shide,", (ep->e_flags & NFSEXP_NOHIDE)?
                                "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)?
@@ -327,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"))
-                       ep->e_flags |= NFSEXP_CROSSMNT;
+                       ep->e_flags |= NFSEXP_NOHIDE;
                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;
-               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;
@@ -370,7 +378,9 @@ parseopts(char *cp, struct exportent *ep, int warn)
                        if (opt[8]=='\0' || *oe != '\0') {
                                xlog(L_ERROR, "%s: %d: bad anonuid \"%s\"\n",
                                     flname, flline, opt);      
+bad_option:
                                free(opt);
+                               export_errno = EINVAL;
                                return -1;
                        }
                } else if (strncmp(opt, "anongid=", 8) == 0) {
@@ -379,18 +389,15 @@ parseopts(char *cp, struct exportent *ep, int warn)
                        if (opt[8]=='\0' || *oe != '\0') {
                                xlog(L_ERROR, "%s: %d: bad anongid \"%s\"\n",
                                     flname, flline, opt);      
-                               free(opt);
-                               return -1;
+                               goto bad_option;
                        }
                } else if (strncmp(opt, "squash_uids=", 12) == 0) {
                        if (parsesquash(opt+12, &squids, &nsquids, &cp) < 0) {
-                               free(opt);
-                               return -1;
+                               goto bad_option;
                        }
                } else if (strncmp(opt, "squash_gids=", 12) == 0) {
                        if (parsesquash(opt+12, &sqgids, &nsqgids, &cp) < 0) {
-                               free(opt);
-                               return -1;
+                               goto bad_option;
                        }
                } else if (strncmp(opt, "fsid=", 5) == 0) {
                        char *oe;
@@ -398,16 +405,14 @@ parseopts(char *cp, struct exportent *ep, int warn)
                        if (opt[5]=='\0' || *oe != '\0') {
                                xlog(L_ERROR, "%s: %d: bad fsid \"%s\"\n",
                                     flname, flline, opt);      
-                               free(opt);
-                               return -1;
+                               goto bad_option;
                        }
                        ep->e_flags |= NFSEXP_FSID;
                } else {
                        xlog(L_ERROR, "%s:%d: unknown keyword \"%s\"\n",
                                        flname, flline, opt);
                        ep->e_flags |= NFSEXP_ALLSQUASH | NFSEXP_READONLY;
-                       free(opt);
-                       return -1;
+                       goto bad_option;
                }
                free(opt);
                while (isblank(*cp))
@@ -421,9 +426,11 @@ parseopts(char *cp, struct exportent *ep, int warn)
 
 out:
        if (warn && !had_sync_opt)
-               xlog(L_WARNING, "No 'sync' or 'async' option specified for export \"%s:%s\".\n"
+               xlog(L_WARNING, "%s [%d]: No 'sync' or 'async' option specified for export \"%s:%s\".\n"
                                "  Assuming default behaviour ('sync').\n"
                                "  NOTE: this default has changed from previous versions\n",
+
+                               flname, flline,
                                ep->e_hostname, ep->e_path);
 
        return 1;