X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fexports.c;h=e6de71aebfbce484e4c5aae3bf99b87c979408ea;hp=eb1bf2c8db165bbd761603c4d06be5f74e569fa1;hb=f8d5dd05dd28fe122832b229c5298d254eb4b581;hpb=8d53a2630763f8f639d2de2ddd26282bff1c7cad

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index eb1bf2c..e6de71a 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -14,7 +14,9 @@
  *		as is, with no warranty expressed or implied.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/param.h>
 #include <stdlib.h>
@@ -22,6 +24,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <errno.h>
 #include "nfslib.h"
 #include "exportfs.h"
 #include "xmalloc.h"
@@ -29,8 +32,11 @@
 #include "xio.h"
 
 #define EXPORT_DEFAULT_FLAGS	\
-  (NFSEXP_ASYNC|NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
+  (NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
 
+int export_errno;
+
+static char	*efname = NULL;
 static XFILE	*efp = NULL;
 static int	first;
 static int	*squids = NULL, nsquids = 0,
@@ -38,7 +44,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);
@@ -55,14 +61,15 @@ 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, int fromexports)
 {
 	static struct exportent	ee;
-	char		exp[512];
+	char		exp[512], *hostname;
 	char		rpath[MAXPATHLEN+1];
 	char		*opt, *sp;
 	int		ok;
@@ -72,11 +79,21 @@ 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;
+	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;
 
@@ -90,6 +107,7 @@ getexportent(void)
 	}
 	if (ok < 0) {
 		xlog(L_ERROR, "expected client(options...)");
+		export_errno = EINVAL;
 		return NULL;
 	}
 	first = 0;
@@ -97,27 +115,34 @@ getexportent(void)
 	/* Check for default client */
 	if (ok == 0)
 		exp[0] = '\0';
+
+	hostname = exp;
 	if ((opt = strchr(exp, '(')) != NULL) {
-		if (opt == exp) 
+		if (opt == exp) {
 			xlog(L_WARNING, "No host name given with %s %s, suggest *%s to avoid warning", ee.e_path, exp, exp);
+			hostname = "*";
+		}
 		*opt++ = '\0';
 		if (!(sp = strchr(opt, ')')) || sp[1] != '\0') {
 			syntaxerr("bad option list");
+			export_errno = EINVAL;
 			return NULL;
 		}
 		*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);
+	    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)) {
+	if (strlen(hostname) >= sizeof(ee.e_hostname)) {
 		syntaxerr("client name too long");
+		export_errno = EINVAL;
 		return NULL;
 	}
-	strncpy(ee.e_hostname, exp, sizeof (ee.e_hostname) - 1);
+	strncpy(ee.e_hostname, hostname, sizeof (ee.e_hostname) - 1);
 	ee.e_hostname[sizeof (ee.e_hostname) - 1] = '\0';
 
+	if (parseopts(opt, &ee, fromexports) < 0)
+		return NULL;
+
 	/* resolve symlinks */
 	if (realpath(ee.e_path, rpath) != NULL) {
 		rpath[sizeof (rpath) - 1] = '\0';
@@ -142,7 +167,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]);
@@ -152,8 +177,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_CROSSMOUNT)?
+				"" : "no");
 	fprintf(fp, "%ssecure,", (ep->e_flags & NFSEXP_INSECURE_PORT)?
 				"in" : "");
 	fprintf(fp, "%sroot_squash,", (ep->e_flags & NFSEXP_ROOTSQUASH)?
@@ -164,6 +191,14 @@ 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) {
@@ -205,6 +240,9 @@ endexportent(void)
 	if (efp)
 		xfclose(efp);
 	efp = NULL;
+	if (efname)
+		free(efname);
+	efname = NULL;
 	freesquash();
 }
 
@@ -222,6 +260,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 *
@@ -231,10 +271,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;
 
@@ -252,7 +293,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 (options && parseopts(options, &ee) < 0)
+	if (parseopts(options, &ee, 0) < 0)
 		return NULL;
 	return &ee;
 }
@@ -260,7 +301,7 @@ mkexportent(char *hname, char *path, char *options)
 int
 updateexportent(struct exportent *eep, char *options)
 {
-	if (options && parseopts(options, eep) < 0)
+	if (parseopts(options, eep, 0) < 0)
 		return 0;
 	return 1;
 }
@@ -269,14 +310,21 @@ 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";
+	int	flline = efp?efp->x_line: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;
@@ -296,14 +344,20 @@ parseopts(char *cp, struct exportent *ep)
 			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"))
-			ep->e_flags |= NFSEXP_CROSSMNT;
+		} else if (!strcmp(opt, "nohide"))
+			ep->e_flags |= NFSEXP_NOHIDE;
 		else if (!strcmp(opt, "hide"))
-			ep->e_flags &= ~NFSEXP_CROSSMNT;
+			ep->e_flags &= ~NFSEXP_NOHIDE;
+		else if (!strcmp(opt, "crossmnt"))
+			ep->e_flags |= NFSEXP_CROSSMOUNT;
+		else if (!strcmp(opt, "nocrossmnt"))
+			ep->e_flags &= ~NFSEXP_CROSSMOUNT;
 		else if (!strcmp(opt, "wdelay"))
 			ep->e_flags |= NFSEXP_GATHERED_WRITES;
 		else if (!strcmp(opt, "no_wdelay"))
@@ -328,33 +382,66 @@ parseopts(char *cp, struct exportent *ep)
 			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 */
 			ep->e_maptype = CLE_MAP_IDENT;
 		else if (strcmp(opt, "map_daemon") == 0)	/* old style */
 			ep->e_maptype = CLE_MAP_UGIDD;
-		else if (strncmp(opt, "anonuid=", 8) == 0)
-			ep->e_anonuid = atoi(opt+8);
-		else if (strncmp(opt, "anongid=", 8) == 0)
-			ep->e_anongid = atoi(opt+8);
-		else if (strncmp(opt, "squash_uids=", 12) == 0) {
-			if (parsesquash(opt+12, &squids, &nsquids, &cp) < 0) {
+		else if (strncmp(opt, "anonuid=", 8) == 0) {
+			char *oe;
+			ep->e_anonuid = strtol(opt+8, &oe, 10);
+			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) {
+			char *oe;
+			ep->e_anongid = strtol(opt+8, &oe, 10);
+			if (opt[8]=='\0' || *oe != '\0') {
+				xlog(L_ERROR, "%s: %d: bad anongid \"%s\"\n",
+				     flname, flline, opt);	
+				goto bad_option;
+			}
+		} else if (strncmp(opt, "squash_uids=", 12) == 0) {
+			if (parsesquash(opt+12, &squids, &nsquids, &cp) < 0) {
+				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;
+			ep->e_fsid = strtoul(opt+5, &oe, 0);
+			if (opt[5]=='\0' || *oe != '\0') {
+				xlog(L_ERROR, "%s: %d: bad fsid \"%s\"\n",
+				     flname, flline, opt);	
+				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,
-				"Unknown keyword \"%s\" in export file\n",
-				opt);
+			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))
@@ -366,6 +453,15 @@ parseopts(char *cp, struct exportent *ep)
 	ep->e_nsquids = nsquids;
 	ep->e_nsqgids = nsqgids;
 
+out:
+	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",
+
+				flname, flline,
+				ep->e_hostname, ep->e_path);
+
 	return 1;
 }
 
@@ -468,14 +564,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?"command line":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?efp->x_line:0, msg);
 }