From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Mon, 14 Dec 2009 21:57:47 +0000 (-0500)
Subject: exports: minor parse_opts cleanup
X-Git-Tag: nfs-utils-1-2-2-rc6~22
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f783ec6a999e424054ccab773e7c6ba6b38eb1fe;p=nfs-utils.git

exports: minor parse_opts cleanup

Move this into a helper function.  (We'll be adding a little more code
here.)

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 1aaebf4..f1ca632 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -470,6 +470,18 @@ static void clearflags(int mask, unsigned int active, struct exportent *ep)
 /* options that can vary per flavor: */
 #define NFSEXP_SECINFO_FLAGS (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
 					| NFSEXP_ALLSQUASH)
+/*
+ * For those flags which are not allowed to vary by pseudoflavor,
+ * ensure that the export flags agree with the flags on each
+ * pseudoflavor:
+ */
+static void fix_pseudoflavor_flags(struct exportent *ep)
+{
+	struct sec_entry *p;
+
+	for (p = ep->e_secinfo; p->flav; p++)
+		p->flags |= ep->e_flags & ~NFSEXP_SECINFO_FLAGS;
+}
 
 /*
  * Parse option string pointed to by cp and set mount options accordingly.
@@ -477,7 +489,6 @@ static void clearflags(int mask, unsigned int active, struct exportent *ep)
 static int
 parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
 {
-	struct sec_entry *p;
 	int	had_subtree_opt = 0;
 	char 	*flname = efname?efname:"command line";
 	int	flline = efp?efp->x_line:0;
@@ -641,9 +652,7 @@ bad_option:
 	 */
 	if (ep->e_fslocdata)
 		ep->e_flags |= NFSEXP_NOHIDE;
-
-	for (p = ep->e_secinfo; p->flav; p++)
-		p->flags |= ep->e_flags & ~NFSEXP_SECINFO_FLAGS;
+	fix_pseudoflavor_flags(ep);
 	ep->e_squids = squids;
 	ep->e_sqgids = sqgids;
 	ep->e_nsquids = nsquids;
@@ -760,4 +769,3 @@ syntaxerr(char *msg)
 	xlog(L_ERROR, "%s:%d: syntax error: %s",
 			efname, efp?efp->x_line:0, msg);
 }
-