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 ecd7c35cd66e43b0ea2b9634bc6c841c7028a537..a0a1f2d03a7c61c5b339bd72498abbe8fac9bde3 100644 (file)
--- 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);
 
                                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_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);
                                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);
                                insert_group(e, exp->m_export.e_hostname);

-                       }

                }
        }
 
                }
        }