Thu Oct 28 11:27:51 EST 1999 Neil Brown <neilb@cse.unsw.edu.au>

[nfs-utils.git] / support / export / rmtab.c

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 44a0edce728bbed6e87fa25911bfafac682e1476..4d0bc028e8dd0aa55ee863fe3eb6e99f55291331 100644 (file)
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -25,28 +25,32 @@ rmtab_read(void)
 
        setrmtabent("r");
        while ((rep = getrmtabent(1)) != NULL) {
-               exp = export_lookup(rep->r_client, rep->r_path);
-               if (!exp) {
-                       struct exportent        *xp;
-                       struct hostent          *hp;
-                       int                     htype;
-
-                       htype = client_gettype(rep->r_client);
-                       if (htype == MCL_FQDN
-                           && (hp = gethostbyname (rep->r_client), hp)
-                           && (hp = hostent_dup (hp),
-                                  xp = export_allowed (hp, rep->r_path))) {
+               struct exportent        *xp;
+               struct hostent          *hp = NULL;
+               int                     htype;
+               
+               htype = client_gettype(rep->r_client);
+               if (htype == MCL_FQDN
+                   && (hp = gethostbyname (rep->r_client))
+                   && (hp = hostent_dup (hp),
+                       xp = export_allowed (hp, rep->r_path))) {
+                       /* see if the entry already exists, otherwise this was an instantiated
+                        * wild card, and we must add it
+                        */
+                       exp = export_lookup(rep->r_client, xp->e_path);
+                       if (!exp) {
                                strncpy (xp->e_hostname, rep->r_client,
                                         sizeof (xp->e_hostname) - 1);
                                xp->e_hostname[sizeof (xp->e_hostname) -1] = '\0';
                                exp = export_create(xp);
-                               free (hp);
                        }
+                       free (hp);
 
                        if (!exp)
                                continue;
                        exp->m_mayexport = 1;
-               }
+               } else if (hp) /* export_allowed failed */
+                       free(hp);
        }
        if (errno == EINVAL) {
                /* Something goes wrong. We need to fix the rmtab