Imported Debian patch 1.0.7-8

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

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index dfb241e6fb498f459ea5d7b7e31e576a2dd41fd5..7194c08e20b20652196565fbefc859470b8ac510 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -87,10 +87,11 @@ getexportent(int fromkernel, int fromexports)
                ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
        }
        ee.e_maptype = CLE_MAP_IDENT;
-       ee.e_anonuid = -2;
-       ee.e_anongid = -2;
+       ee.e_anonuid = 65534;
+       ee.e_anongid = 65534;
        ee.e_squids = NULL;
        ee.e_sqgids = NULL;
+       ee.e_mountpoint = NULL;
        ee.e_nsquids = 0;
        ee.e_nsqgids = 0;
 
@@ -160,7 +161,7 @@ putexportent(struct exportent *ep)
 
        fp = efp->x_fp;
        for (i=0; esc[i]; i++)
-               if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\'|| isspace(esc[i]))
+               if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\' || esc[i] == '#' || isspace(esc[i]))
                        fprintf(fp, "\\%03o", esc[i]);
                else
                        fprintf(fp, "%c", esc[i]);
@@ -172,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" : "");
@@ -184,9 +185,15 @@ putexportent(struct exportent *ep)
                "no_" : "");
        fprintf(fp, "%ssecure_locks,", (ep->e_flags & NFSEXP_NOAUTHNLM)?
                "in" : "");
+       fprintf(fp, "%sacl,", (ep->e_flags & NFSEXP_NOACL)?
+               "no_" : "");
        if (ep->e_flags & NFSEXP_FSID) {
                fprintf(fp, "fsid=%d,", ep->e_fsid);
        }
+       if (ep->e_mountpoint)
+               fprintf(fp, "mountpoint%s%s,",
+                       ep->e_mountpoint[0]?"=":"", ep->e_mountpoint);
+
        fprintf(fp, "mapping=");
        switch (ep->e_maptype) {
        case CLE_MAP_IDENT:
@@ -247,6 +254,8 @@ dupexportent(struct exportent *dst, struct exportent *src)
                dst->e_sqgids = (int *) xmalloc(n * sizeof(int));
                memcpy(dst->e_sqgids, src->e_sqgids, n * sizeof(int));
        }
+       if (src->e_mountpoint)
+               dst->e_mountpoint = strdup(src->e_mountpoint);
 }
 
 struct exportent *
@@ -256,10 +265,11 @@ mkexportent(char *hname, char *path, char *options)
 
        ee.e_flags = EXPORT_DEFAULT_FLAGS;
        ee.e_maptype = CLE_MAP_IDENT;
-       ee.e_anonuid = -2;
-       ee.e_anongid = -2;
+       ee.e_anonuid = 65534;
+       ee.e_anongid = 65534;
        ee.e_squids = NULL;
        ee.e_sqgids = NULL;
+       ee.e_mountpoint = NULL;
        ee.e_nsquids = 0;
        ee.e_nsqgids = 0;
 
@@ -339,9 +349,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"))
@@ -366,6 +376,10 @@ parseopts(char *cp, struct exportent *ep, int warn)
                        ep->e_flags &= ~NFSEXP_NOAUTHNLM;
                else if (strcmp(opt, "insecure_locks") == 0)
                        ep->e_flags |= NFSEXP_NOAUTHNLM;
+               else if (strcmp(opt, "acl") == 0)
+                       ep->e_flags &= ~NFSEXP_NOACL;
+               else if (strcmp(opt, "no_acl") == 0)
+                       ep->e_flags |= NFSEXP_NOACL;
                else if (strncmp(opt, "mapping=", 8) == 0)
                        ep->e_maptype = parsemaptype(opt+8);
                else if (strcmp(opt, "map_identity") == 0)      /* old style */
@@ -408,6 +422,15 @@ bad_option:
                                goto bad_option;
                        }
                        ep->e_flags |= NFSEXP_FSID;
+               } else if (strcmp(opt, "mountpoint")==0 ||
+                          strcmp(opt, "mp") == 0 ||
+                          strncmp(opt, "mountpoint=", 11)==0 ||
+                          strncmp(opt, "mp=", 3) == 0) {
+                       char * mp = strchr(opt, '=');
+                       if (mp)
+                               ep->e_mountpoint = strdup(mp+1);
+                       else
+                               ep->e_mountpoint = strdup("");
                } else {
                        xlog(L_ERROR, "%s:%d: unknown keyword \"%s\"\n",
                                        flname, flline, opt);
@@ -425,7 +448,7 @@ bad_option:
        ep->e_nsqgids = nsqgids;
 
 out:
-       if (warn && !had_sync_opt)
+       if (warn && !had_sync_opt && !(ep->e_flags & NFSEXP_READONLY))
                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",