From: neilbrown <neilbrown>
Date: Fri, 7 Oct 2005 04:45:54 +0000 (+0000)
Subject: Small nfs-utils patch from Olaf Kirch
X-Git-Tag: nfs-utils-1-0-8-rc1~5
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=3ab68bab215d41355e2933d07acc8f06a88515f8

Small nfs-utils patch from Olaf Kirch
---

diff --git a/ChangeLog b/ChangeLog
index df3ae49..b67dbdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-07 Olaf Kirch <okir@suse.de>
+	* utils/mountd/mountd.c(get_exportlist): Without this patch,
+	showmount -e would sometimes display host names that should really
+	have been subsumed under a wildcard entry.
+
+	The problem was that the code in get_exportlist would always
+	skip the next group entry after removing one FQDN.
+
 2005-10-06 Steve Dickson <SteveD@redhat.com> NeilBrown <neilb@suse.de>
 	* support/nfs/export.c: don't warn about sync/async for readonly
 	exports
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index a9ec1c7..8a2f413 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -425,11 +425,9 @@ get_exportlist(void)
 				xfree(c->gr_name);
 				xfree(c);
 				xfree (hp);
-				if ((c = *cp) == NULL)
-				  break;
+				continue;
 			      }
-			      else
-				xfree (hp);
+			      xfree (hp);
 			    }
 			    cp = &(c->gr_next);
 			  }