X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fv4root.c;h=c33a5a9eb79d690580e81825de197d799d214ded;hp=d890181b5f2fab86ce60c26978884aab25e624fb;hb=014e00dfaea0efc92150e2aedc5ca43aa337545e;hpb=3b777b084a438f55482c8bf7508903ff4c30e1db

diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
index d890181..c33a5a9 100644
--- a/utils/mountd/v4root.c
+++ b/utils/mountd/v4root.c
@@ -137,6 +137,34 @@ int pseudofs_update(char *hostname, char *path, nfs_export *source)
 	return 0;
 }
 
+static int v4root_add_parents(nfs_export *exp)
+{
+	char *hostname = exp->m_export.e_hostname;
+	char *path;
+	char *ptr;
+
+	path = strdup(exp->m_export.e_path);
+	if (!path) {
+		xlog(L_WARNING, "v4root_add_parents: Unable to create "
+				"pseudo export for '%s'", exp->m_export.e_path);
+		return -ENOMEM;
+	}
+	for (ptr = path + 1; ptr; ptr = strchr(ptr, '/')) {
+		int ret;
+		char saved;
+
+		saved = *ptr;
+		*ptr = '\0';
+		ret = pseudofs_update(hostname, path, exp);
+		if (ret)
+			return ret;
+		*ptr = saved;
+		ptr++;
+	}
+	free(path);
+	return 0;
+}
+
 /*
  * Create pseudo exports by running through the real export
  * looking at the components of the path that make up the export.
@@ -147,10 +175,8 @@ int pseudofs_update(char *hostname, char *path, nfs_export *source)
 void
 v4root_set()
 {
-	nfs_export	*exp, *nxt;
+	nfs_export	*exp;
 	int	i;
-	char *path, *ptr;
-	char *hostname;
 
 	if (!v4root_needed)
 		return;
@@ -158,23 +184,16 @@ v4root_set()
 		return;
 
 	for (i = 0; i < MCL_MAXTYPES; i++) {
-		for (exp = exportlist[i].p_head; exp; exp = nxt) {
-			nxt = exp->m_next;
-			hostname = exp->m_export.e_hostname;
-
-			path = strdup(exp->m_export.e_path);
-			for (ptr = path + 1; ptr; ptr = strchr(ptr, '/')) {
-				int ret;
-				char saved;
-
-				saved = *ptr;
-				*ptr = '\0';
-				ret = pseudofs_update(hostname, path, exp);
-				/* XXX: error handling */
-				*ptr = saved;
-				ptr++;
-			}
-			free(path);
+		for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
+			if (exp->m_export.e_flags & NFSEXP_V4ROOT)
+				/*
+				 * We just added this one, so its
+				 * parents are already dealt with!
+				 */
+				continue;
+
+			v4root_add_parents(exp);
+			/* XXX: error handling! */
 		}
 	}
 }