From 55257d644359aec6fba463968bd503d5ae231eb7 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 27 Nov 2009 15:05:10 -0500 Subject: [PATCH 1/1] mountd: get_exportlist() cleanup Comment clarification, minor style cleanup. Signed-off-by: J. Bruce Fields --- utils/mountd/mountd.c | 11 ++++------- 1 file 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); - } } } -- 2.39.5