From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Fri, 27 Nov 2009 20:05:10 +0000 (-0500)
Subject: mountd: get_exportlist() cleanup
X-Git-Tag: nfs-utils-1-2-2-rc6~11
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=55257d644359aec6fba463968bd503d5ae231eb7;p=nfs-utils.git

mountd: get_exportlist() cleanup

Comment clarification, minor style cleanup.

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index ecd7c35..a0a1f2d 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -612,20 +612,17 @@ get_exportlist(void)
 				continue;
 			e = lookup_or_create_elist_entry(&elist, exp);
 
-			/* We need to check if we should remove
-			   previous ones. */
+			/* exports to "*" absorb any others */
 			if (i == MCL_ANONYMOUS && e->ex_groups) {
 				remove_all_clients(e);
 				continue;
 			}
-
-			if (i != MCL_FQDN && e->ex_groups) {
+			/* non-FQDN's absorb FQDN's they contain: */
+			if (i != MCL_FQDN && e->ex_groups)
 				prune_clients(exp, e);
-			}
 
-			if (exp->m_export.e_hostname [0] != '\0') {
+			if (exp->m_export.e_hostname[0] != '\0')
 				insert_group(e, exp->m_export.e_hostname);
-			}
 		}
 	}