#include "xio.h"
#define EXPORT_DEFAULT_FLAGS \
- (NFSEXP_ASYNC|NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
+ (NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
+static char *efname = NULL;
static XFILE *efp = NULL;
static int first;
static int *squids = NULL, nsquids = 0,
if (!(efp = xfopen(fname, type)))
xlog(L_ERROR, "can't open %s for %sing",
fname, strcmp(type, "r")? "writ" : "read");
+ efname = strdup(fname);
first = 1;
}
struct exportent *
-getexportent(void)
+getexportent(int fromkernel)
{
static struct exportent ee;
char exp[512];
freesquash();
ee.e_flags = EXPORT_DEFAULT_FLAGS;
+ /* some kernels assume the default is sync rather than
+ * async. More recent kernels always report one or other,
+ * but this test makes sure we assume same as kernel
+ * Ditto for wgather
+ */
+ if (fromkernel) {
+ ee.e_flags &= ~NFSEXP_ASYNC;
+ ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
+ }
ee.e_maptype = CLE_MAP_IDENT;
ee.e_anonuid = -2;
ee.e_anongid = -2;
if (ok == 0)
exp[0] = '\0';
if ((opt = strchr(exp, '(')) != NULL) {
+ if (opt == exp)
+ xlog(L_WARNING, "No host name given with %s %s, suggest *%s to avoid warning", ee.e_path, exp, exp);
*opt++ = '\0';
if (!(sp = strchr(opt, ')')) || sp[1] != '\0') {
syntaxerr("bad option list");
return NULL;
}
*sp = '\0';
- if (parseopts(opt, &ee) < 0)
- return NULL;
+ } else {
+ xlog(L_WARNING, "No options for %s %s: suggest %s(sync) to avoid warning", ee.e_path, exp, exp);
}
if (strlen(exp) >= sizeof(ee.e_hostname)) {
syntaxerr("client name too long");
strncpy(ee.e_hostname, exp, sizeof (ee.e_hostname) - 1);
ee.e_hostname[sizeof (ee.e_hostname) - 1] = '\0';
+ if (parseopts(opt, &ee) < 0)
+ return NULL;
+
/* resolve symlinks */
if (realpath(ee.e_path, rpath) != NULL) {
rpath[sizeof (rpath) - 1] = '\0';
{
FILE *fp;
int *id, i;
+ char *esc=ep->e_path;
if (!efp)
return;
fp = efp->x_fp;
- fprintf(fp, "%s\t%s(", ep->e_path, ep->e_hostname);
+ for (i=0; esc[i]; i++)
+ if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\'|| isspace(esc[i]))
+ fprintf(fp, "\\%03o", esc[i]);
+ else
+ fprintf(fp, "%c", esc[i]);
+
+ fprintf(fp, "\t%s(", ep->e_hostname);
fprintf(fp, "%s,", (ep->e_flags & NFSEXP_READONLY)? "ro" : "rw");
fprintf(fp, "%ssync,", (ep->e_flags & NFSEXP_ASYNC)? "a" : "");
fprintf(fp, "%swdelay,", (ep->e_flags & NFSEXP_GATHERED_WRITES)?
"" : "no_");
fprintf(fp, "%ssubtree_check,", (ep->e_flags & NFSEXP_NOSUBTREECHECK)?
"no_" : "");
+ fprintf(fp, "%ssecure_locks,", (ep->e_flags & NFSEXP_NOAUTHNLM)?
+ "in" : "");
fprintf(fp, "mapping=");
switch (ep->e_maptype) {
if (efp)
xfclose(efp);
efp = NULL;
+ if (efname)
+ free(efname);
+ efname = NULL;
freesquash();
}
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 (options && parseopts(options, &ee) < 0)
+ if (parseopts(options, &ee) < 0)
return NULL;
return ⅇ
}
int
updateexportent(struct exportent *eep, char *options)
{
- if (options && parseopts(options, eep) < 0)
+ if (parseopts(options, eep) < 0)
return 0;
return 1;
}
static int
parseopts(char *cp, struct exportent *ep)
{
+ int had_sync_opt = 0;
squids = ep->e_squids; nsquids = ep->e_nsquids;
sqgids = ep->e_sqgids; nsqgids = ep->e_nsqgids;
+ if (!cp)
+ goto out;
+
while (isblank(*cp))
cp++;
+
while (*cp) {
char *opt = strdup(cp);
char *optstart = cp;
ep->e_flags &= ~NFSEXP_INSECURE_PORT;
else if (!strcmp(opt, "insecure"))
ep->e_flags |= NFSEXP_INSECURE_PORT;
- else if (!strcmp(opt, "sync"))
+ else if (!strcmp(opt, "sync")) {
+ had_sync_opt = 1;
ep->e_flags &= ~NFSEXP_ASYNC;
- else if (!strcmp(opt, "async"))
+ } else if (!strcmp(opt, "async")) {
+ had_sync_opt = 1;
ep->e_flags |= NFSEXP_ASYNC;
- else if (!strcmp(opt, "nohide"))
+ } else if (!strcmp(opt, "nohide"))
ep->e_flags |= NFSEXP_CROSSMNT;
else if (!strcmp(opt, "hide"))
ep->e_flags &= ~NFSEXP_CROSSMNT;
+ else if (!strcmp(opt, "crossmnt")) /* old style */
+ ep->e_flags |= NFSEXP_CROSSMNT;
+ else if (!strcmp(opt, "nocrossmnt")) /* old style */
+ ep->e_flags &= ~NFSEXP_CROSSMNT;
else if (!strcmp(opt, "wdelay"))
ep->e_flags |= NFSEXP_GATHERED_WRITES;
else if (!strcmp(opt, "no_wdelay"))
ep->e_flags &= ~NFSEXP_NOSUBTREECHECK;
else if (strcmp(opt, "no_subtree_check") == 0)
ep->e_flags |= NFSEXP_NOSUBTREECHECK;
+ else if (strcmp(opt, "auth_nlm") == 0)
+ ep->e_flags &= ~NFSEXP_NOAUTHNLM;
+ else if (strcmp(opt, "no_auth_nlm") == 0)
+ ep->e_flags |= NFSEXP_NOAUTHNLM;
+ else if (strcmp(opt, "secure_locks") == 0)
+ ep->e_flags &= ~NFSEXP_NOAUTHNLM;
+ else if (strcmp(opt, "insecure_locks") == 0)
+ ep->e_flags |= NFSEXP_NOAUTHNLM;
else if (strncmp(opt, "mapping=", 8) == 0)
ep->e_maptype = parsemaptype(opt+8);
else if (strcmp(opt, "map_identity") == 0) /* old style */
return -1;
}
} else {
- xlog(L_ERROR,
- "Unknown keyword \"%s\" in export file\n",
- opt);
+ xlog(L_ERROR, "%s:%d: unknown keyword \"%s\"\n",
+ efname, efp->x_line, opt);
ep->e_flags |= NFSEXP_ALLSQUASH | NFSEXP_READONLY;
free(opt);
return -1;
ep->e_nsquids = nsquids;
ep->e_nsqgids = nsqgids;
+out:
+ if (!had_sync_opt)
+ xlog(L_WARNING, "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",
+ ep->e_hostname, ep->e_path);
+
return 1;
}
cp++;
} while(1);
- if (*cp == ',') *ep = cp+1;
-
+ if (**ep == ',') (*ep)++;
+
*lenp = len;
*idp = id;
return 1;
xskip(efp, " \t");
if ((ok = xgettok(efp, 0, exp, len)) < 0)
- xlog(L_ERROR, "error parsing export entry");
+ xlog(L_ERROR, "%s:%d: syntax error",
+ efname, efp->x_line);
return ok;
}
static void
syntaxerr(char *msg)
{
- xlog(L_ERROR, "syntax error in exports file (line %d): %s",
- efp->x_line, msg);
+ xlog(L_ERROR, "%s:%d: syntax error: %s",
+ efname, efp->x_line, msg);
}
projects / nfs-utils.git / blobdiff