X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fexports.c;h=7e0decf0b4d12cb77b868aff7eb4f7b7a48f2f15;hp=078c806f3c4c672c8b94d4fef49e7b30ae48a68e;hb=0bd51f4c931eb68c355140c721763be64213a3ca;hpb=a24504ade282e4f7e2dec379368a2fd41680f388

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 078c806..7e0decf 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -31,6 +31,7 @@
 #define EXPORT_DEFAULT_FLAGS	\
   (NFSEXP_ASYNC|NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
 
+static char	*efname = NULL;
 static XFILE	*efp = NULL;
 static int	first;
 static int	*squids = NULL, nsquids = 0,
@@ -55,11 +56,12 @@ setexportent(char *fname, char *type)
 	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];
@@ -72,6 +74,15 @@ getexportent(void)
 
 	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;
@@ -98,6 +109,8 @@ getexportent(void)
 	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");
@@ -106,6 +119,8 @@ getexportent(void)
 		*sp = '\0';
 		if (parseopts(opt, &ee) < 0)
 			return NULL;
+	} else {
+	    xlog(L_WARNING, "No options for %s %s: suggest %s() to avoid warning", ee.e_path, exp, exp);
 	}
 	if (strlen(exp) >= sizeof(ee.e_hostname)) {
 		syntaxerr("client name too long");
@@ -131,12 +146,19 @@ putexportent(struct exportent *ep)
 {
 	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)?
@@ -151,6 +173,8 @@ putexportent(struct exportent *ep)
 				"" : "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) {
@@ -192,6 +216,9 @@ endexportent(void)
 	if (efp)
 		xfclose(efp);
 	efp = NULL;
+	if (efname)
+		free(efname);
+	efname = NULL;
 	freesquash();
 }
 
@@ -291,6 +318,10 @@ parseopts(char *cp, struct exportent *ep)
 			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"))
@@ -307,6 +338,14 @@ parseopts(char *cp, struct exportent *ep)
 			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 */
@@ -328,9 +367,8 @@ parseopts(char *cp, struct exportent *ep)
 				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;
@@ -384,8 +422,8 @@ parsesquash(char *list, int **idp, int *lenp, char **ep)
 		cp++;
 	} while(1);
 
-	if (*cp == ',') *ep = cp+1;
-	
+	if (**ep == ',') (*ep)++;
+
 	*lenp = len;
 	*idp = id;
 	return 1;
@@ -447,14 +485,15 @@ getexport(char *exp, int len)
 
 	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);
 }