X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fexportfs%2Fexportfs.c;h=b4f0226042b22048725945755f0c04d99ef11757;hp=bd48e98fd4eaeb68fb9023dd7ac2a549b1e71510;hb=83e21e0398d4aa4028fb14586a7726da9088b65f;hpb=d38ea02d0e4bcdc4e0114567028596f7bcba45b9

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index bd48e98..b4f0226 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -91,14 +91,23 @@ main(int argc, char **argv)
 		fprintf(stderr, "exportfs: -r and -u are incompatible.\n");
 		return 1;
 	}
+	new_cache = check_new_cache();
 	if (optind == argc && ! f_all) {
-		xtab_export_read();
-		dump(f_verbose);
-		return 0;
+		if (force_flush) {
+			if (new_cache)
+				cache_flush(1);
+			else {
+				fprintf(stderr, "exportfs: -f: only available with new cache controls: mount /proc/fs/nfsd first\n");
+				exit(1);
+			}
+			return 0;
+		} else {
+			xtab_export_read();
+			dump(f_verbose);
+			return 0;
+		}
 	}
 
-	new_cache = check_new_cache();
-
 	if (f_export && ! f_ignore)
 		export_read(_PATH_EXPORTS);
 	if (f_export) {
@@ -121,7 +130,8 @@ main(int argc, char **argv)
 		if (!f_export)
 			for (i = optind ; i < argc ; i++)
 				unexportfs(argv[i], f_verbose);
-		rmtab_read();
+		if (!new_cache)
+			rmtab_read();
 	}
 	if (!new_cache) {
 		xtab_mount_read();
@@ -283,10 +293,14 @@ unexportfs(char *arg, int verbose)
 	for (exp = exportlist[htype]; exp; exp = exp->m_next) {
 		if (path && strcmp(path, exp->m_export.e_path))
 			continue;
-		if (htype != exp->m_client->m_type
-		    || (htype == MCL_FQDN
-		        && !matchhostname(exp->m_export.e_hostname,
-					  hname)))
+		if (htype != exp->m_client->m_type)
+			continue;
+		if (htype == MCL_FQDN
+		    && !matchhostname(exp->m_export.e_hostname,
+					  hname))
+			continue;
+		if (htype != MCL_FQDN
+		    && strcasecmp(exp->m_export.e_hostname, hname))
 			continue;
 		if (verbose) {
 #if 0
@@ -360,7 +374,7 @@ dump(int verbose)
 				c = dumpopt(c, "wdelay");
 			if (ep->e_flags & NFSEXP_NOHIDE)
 				c = dumpopt(c, "nohide");
-			if (ep->e_flags & NFSEXP_CROSSMNT)
+			if (ep->e_flags & NFSEXP_CROSSMOUNT)
 				c = dumpopt(c, "crossmnt");
 			if (ep->e_flags & NFSEXP_INSECURE_PORT)
 				c = dumpopt(c, "insecure");