X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fexportfs%2Fexportfs.c;h=60f130e6f802bf1781a87d6bddfa99c0b3d05b41;hp=44761f89898d69ef3ff08127665dda6560eae3c0;hb=0036a143c415eac6388d992a4e637e7004147296;hpb=8b7ad01b14df1e7529b9ba8a1ea17df0d6004ef9

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 44761f8..60f130e 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -24,7 +24,6 @@
 #include "xlog.h"
 
 static void	export_all(int verbose);
-static void	unexport_all(int verbose);
 static void	exportfs(char *arg, char *options, int verbose);
 static void	unexportfs(char *arg, int verbose);
 static void	exports_update(int verbose);
@@ -46,6 +45,8 @@ main(int argc, char **argv)
 
 	xlog_open("exportfs");
 
+	export_errno = 0;
+
 	while ((c = getopt(argc, argv, "aio:ruv")) != EOF) {
 		switch(c) {
 		case 'a':
@@ -100,25 +101,27 @@ main(int argc, char **argv)
 			for (i = optind; i < argc ; i++)
 				exportfs(argv[i], options, f_verbose);
 	}
-	/* note: xtab_*_read does not update entries if they already exist,
-	 * so this will not lose new options
+	/* If we are unexporting everything, then
+	 * don't care about what should be exported, as that
+	 * may require DNS lookups..
 	 */
-	if (!f_reexport)
-		xtab_export_read();
-	if (!f_export) {
-		if (f_all)
-			unexport_all(f_verbose);
-		else
+	if (! ( !f_export && f_all)) {
+		/* note: xtab_*_read does not update entries if they already exist,
+		 * so this will not lose new options
+		 */
+		if (!f_reexport)
+			xtab_export_read();
+		if (!f_export)
 			for (i = optind ; i < argc ; i++)
 				unexportfs(argv[i], f_verbose);
+		rmtab_read();
 	}
-	rmtab_read();
 	xtab_mount_read();
 	exports_update(f_verbose);
 	xtab_export_write();
 	xtab_mount_write();
 
-	return 0;
+	return export_errno;
 }
 
 /* we synchronise intention with reality.
@@ -132,7 +135,7 @@ exports_update(int verbose)
 	nfs_export 	*exp;
 
 	for (exp = exportlist[MCL_FQDN]; exp; exp=exp->m_next) {
-		if (exp->m_mayexport && (!exp->m_exported || exp->m_changed)) {
+		if (exp->m_mayexport && ((exp->m_exported<1) || exp->m_changed)) {
 			if (verbose)
 				printf("%sexporting %s:%s to kernel\n",
 				       exp->m_exported ?"re":"",
@@ -174,38 +177,6 @@ export_all(int verbose)
 		}
 	}
 }
-/*
- * unexport_all finds all entries that are mayexport, and
- *    marks them not xtabent and not mayexport
- */
-static void
-unexport_all(int verbose)
-{
-	nfs_export	*exp;
-	int		i;
-
-	for (i = 0; i < MCL_MAXTYPES; i++) {
-		for (exp = exportlist[i]; exp; exp = exp->m_next)
-			if (exp->m_mayexport) {
-				if (verbose) {
-					if (exp->m_exported) {
-						printf("unexporting %s:%s from kernel\n",
-						       exp->m_client->m_hostname,
-						       exp->m_export.e_path);
-					}
-					else {
-						printf("unexporting %s:%s\n",
-						        exp->m_client->m_hostname, 
-							exp->m_export.e_path);
-					}
-				}
-				if (exp->m_exported && !export_unexport(exp))
-					error(exp, errno);
-				exp->m_xtabent = 0;
-				exp->m_mayexport = 0;
-			}
-	}
-}
 
 
 static void
@@ -228,15 +199,23 @@ exportfs(char *arg, char *options, int verbose)
 
 	if ((htype = client_gettype(hname)) == MCL_FQDN &&
 	    (hp = gethostbyname(hname)) != NULL) {
-		hp = hostent_dup (hp);
+		struct hostent *hp2 = hostent_dup (hp);
+		hp = gethostbyaddr(hp2->h_addr, hp2->h_length,
+				   hp2->h_addrtype);
+		if (hp) {
+			free(hp2);
+			hp = hostent_dup(hp);
+		} else
+			hp = hp2;
 		exp = export_find(hp, path);
+		hname = hp->h_name;
 	} else {
-		exp = export_lookup(hname, path);
+		exp = export_lookup(hname, path, 0);
 	}
 
 	if (!exp) {
 		if (!(eep = mkexportent(hname, path, options)) ||
-		    !(exp = export_create(eep))) {
+		    !(exp = export_create(eep, 0))) {
 			if (hp) free (hp);
 			return;
 		}
@@ -354,6 +333,8 @@ dump(int verbose)
 				c = dumpopt(c, "async");
 			if (ep->e_flags & NFSEXP_GATHERED_WRITES)
 				c = dumpopt(c, "wdelay");
+			if (ep->e_flags & NFSEXP_CROSSMNT)
+				c = dumpopt(c, "nohide");
 			if (ep->e_flags & NFSEXP_INSECURE_PORT)
 				c = dumpopt(c, "insecure");
 			if (ep->e_flags & NFSEXP_ROOTSQUASH)
@@ -362,6 +343,12 @@ dump(int verbose)
 				c = dumpopt(c, "no_root_squash");
 			if (ep->e_flags & NFSEXP_ALLSQUASH)
 				c = dumpopt(c, "all_squash");
+			if (ep->e_flags & NFSEXP_NOSUBTREECHECK)
+				c = dumpopt(c, "no_subtree_check");
+			if (ep->e_flags & NFSEXP_NOAUTHNLM)
+				c = dumpopt(c, "insecure_locks");
+			if (ep->e_flags & NFSEXP_FSID)
+				c = dumpopt(c, "fsid=%d", ep->e_fsid);
 			if (ep->e_maptype == CLE_MAP_UGIDD)
 				c = dumpopt(c, "mapping=ugidd");
 			else if (ep->e_maptype == CLE_MAP_FILE)