Merge branch 'sid'

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

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 15aab155ff18791c15d6ab68ba32f82d7909a5f6..d16b3b33b692dd421814590c2dcaddeeab0dd957 100644 (file)
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -1,7 +1,7 @@
 /*
- * support/export/rmntab.c
+ * support/export/rmtab.c
  *
- * Interface to the rmnt file.
+ * Interface to the rmtab file.
  *
  */
 
@@ -12,54 +12,67 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "xmalloc.h"
+
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
 #include "xio.h"
 #include "xlog.h"
 
+/*
+ * See if the entry already exists.  If not,
+ * this was an instantiated wild card, and we
+ * must add it.
+ */
+static void
+rmtab_read_wildcard(struct rmtabent *rep)
+{
+       nfs_export *exp, *exp2;
+       struct addrinfo *ai;
+
+       ai = host_addrinfo(rep->r_client);
+       if (ai == NULL)
+               return;
+
+       exp = export_allowed(ai, rep->r_path);
+       freeaddrinfo(ai);
+       if (exp == NULL)
+               return;
+
+       exp2 = export_lookup(rep->r_client, exp->m_export.e_path, 0);
+       if (exp2 == NULL) {
+               struct exportent ee;
+
+               memset(&ee, 0, sizeof(ee));
+               dupexportent(&ee, &exp->m_export);
+
+               ee.e_hostname = rep->r_client;
+               exp2 = export_create(&ee, 0);
+               exp2->m_changed = exp->m_changed;
+       }
+       exp2->m_mayexport = 1;
+}
+
 int
 rmtab_read(void)
 {
        struct rmtabent         *rep;
-       nfs_export              *exp;
 
        setrmtabent("r");
        while ((rep = getrmtabent(1, NULL)) != NULL) {
-               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),
-                       exp = export_allowed (hp, rep->r_path))) {
-                       /* see if the entry already exists, otherwise this was an instantiated
-                        * wild card, and we must add it
-                        */
-                       nfs_export *exp2 = export_lookup(rep->r_client,
-                                                       exp->m_export.e_path, 0);
-                       if (!exp2) {
-                               struct exportent ee;
-                               dupexportent(&ee, &exp->m_export);
-                               strncpy (ee.e_hostname, rep->r_client,
-                                        sizeof (ee.e_hostname) - 1);
-                               ee.e_hostname[sizeof (ee.e_hostname) -1] = '\0';
-                               exp2 = export_create(&ee, 0);
-                               exp2->m_changed = exp->m_changed;
-                       }
-                       free (hp);
-                       exp2->m_mayexport = 1;
-               } else if (hp) /* export_allowed failed */
-                       free(hp);
+               if (htype == MCL_FQDN || htype == MCL_SUBNETWORK)
+                       rmtab_read_wildcard(rep);
        }
+
        if (errno == EINVAL) {
                /* Something goes wrong. We need to fix the rmtab
                   file. */
                int     lockid;
                FILE    *fp;
-               if ((lockid = xflock(_PATH_RMTAB, "w")) < 0)
+               if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
                        return -1;
                rewindrmtabent();
                if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) {