X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fexports.c;h=dfb241e6fb498f459ea5d7b7e31e576a2dd41fd5;hp=ce49edc2e4f641dc3a1d4ac80c1a94a340810b45;hb=refs%2Ftags%2Fnfs-utils-1-1-0-pre2;hpb=40c87b1d669a34447824a81e24f9bb38417d702d diff --git a/support/nfs/exports.c b/support/nfs/exports.c index ce49edc..dfb241e 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -22,6 +22,7 @@ #include #include #include +#include #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; @@ -39,7 +42,7 @@ static int *squids = NULL, nsquids = 0, static int getexport(char *exp, int len); static int getpath(char *path, int len); -static int parseopts(char *cp, struct exportent *ep); +static int parseopts(char *cp, struct exportent *ep, int warn); static int parsesquash(char *list, int **idp, int *lenp, char **ep); static int parsenum(char **cpp); static int parsemaptype(char *type); @@ -61,7 +64,7 @@ setexportent(char *fname, char *type) } struct exportent * -getexportent(int fromkernel) +getexportent(int fromkernel, int fromexports) { static struct exportent ee; char exp[512]; @@ -101,6 +104,7 @@ getexportent(int fromkernel) } if (ok < 0) { xlog(L_ERROR, "expected client(options...)"); + export_errno = EINVAL; return NULL; } first = 0; @@ -114,6 +118,7 @@ getexportent(int fromkernel) *opt++ = '\0'; if (!(sp = strchr(opt, ')')) || sp[1] != '\0') { syntaxerr("bad option list"); + export_errno = EINVAL; return NULL; } *sp = '\0'; @@ -122,12 +127,13 @@ getexportent(int fromkernel) } 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); ee.e_hostname[sizeof (ee.e_hostname) - 1] = '\0'; - if (parseopts(opt, &ee) < 0) + if (parseopts(opt, &ee, fromexports) < 0) return NULL; /* resolve symlinks */ @@ -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)? @@ -269,7 +277,7 @@ mkexportent(char *hname, char *path, char *options) ee.e_path[sizeof (ee.e_path) - 1] = '\0'; strncpy (ee.m_path, ee.e_path, sizeof (ee.m_path) - 1); ee.m_path [sizeof (ee.m_path) - 1] = '\0'; - if (parseopts(options, &ee) < 0) + if (parseopts(options, &ee, 0) < 0) return NULL; return ⅇ } @@ -277,7 +285,7 @@ mkexportent(char *hname, char *path, char *options) int updateexportent(struct exportent *eep, char *options) { - if (parseopts(options, eep) < 0) + if (parseopts(options, eep, 0) < 0) return 0; return 1; } @@ -286,7 +294,7 @@ updateexportent(struct exportent *eep, char *options) * Parse option string pointed to by cp and set mount options accordingly. */ static int -parseopts(char *cp, struct exportent *ep) +parseopts(char *cp, struct exportent *ep, int warn) { int had_sync_opt = 0; char *flname = efname?efname:"command line"; @@ -327,12 +335,12 @@ parseopts(char *cp, struct exportent *ep) 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) 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) 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) 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)) @@ -420,10 +425,12 @@ parseopts(char *cp, struct exportent *ep) ep->e_nsqgids = nsqgids; out: - if (!had_sync_opt) - xlog(L_WARNING, "No 'sync' or 'async' option specified for export \"%s:%s\".\n" + if (warn && !had_sync_opt) + 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;