summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-11-27 15:05:10 -0500
committerSteve Dickson <steved@redhat.com>2010-01-13 15:39:14 -0500
commit55257d644359aec6fba463968bd503d5ae231eb7 (patch)
tree06172881340874620f1575ccdb222b4bc3192dee
parent8ec371fe01e96c008cdc6143db716f1a9bfb6566 (diff)
downloadnfs-utils-55257d644359aec6fba463968bd503d5ae231eb7.tar.gz
nfs-utils-55257d644359aec6fba463968bd503d5ae231eb7.tar.xz
nfs-utils-55257d644359aec6fba463968bd503d5ae231eb7.zip
mountd: get_exportlist() cleanup
Comment clarification, minor style cleanup. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--utils/mountd/mountd.c11
1 files changed, 4 insertions, 7 deletions
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);
- }
}
}