]> git.decadent.org.uk Git - nfs-utils.git/blobdiff - support/export/client.c
libexport.a: Refactor client_init()
[nfs-utils.git] / support / export / client.c
index 419a4a7d930f6999e8a0f26dc397fce2b3d5f899..9259180dd1d618f4a36196becade0751769df821 100644 (file)
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <netdb.h>
-#include "xmalloc.h"
+
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
@@ -30,12 +30,89 @@ extern int  innetgr(char *netgr, char *host, char *, char *);
 #endif
 
 static char    *add_name(char *old, const char *add);
-static void    client_init(nfs_client *clp, const char *hname,
-                                       struct hostent *hp);
 
 nfs_client     *clientlist[MCL_MAXTYPES] = { NULL, };
 
 
+static void
+init_addrlist(nfs_client *clp, const struct hostent *hp)
+{
+       char **ap;
+       int i;
+
+       if (hp == NULL)
+               return;
+
+       ap = hp->h_addr_list;
+       for (i = 0; *ap != NULL && i < NFSCLNT_ADDRMAX; i++, ap++)
+               clp->m_addrlist[i] = *(struct in_addr *)*ap;
+
+       clp->m_naddr = i;
+}
+
+static void
+client_free(nfs_client *clp)
+{
+       free(clp->m_hostname);
+       free(clp);
+}
+
+static int
+init_netmask(nfs_client *clp, const char *slash)
+{
+       if (strchr(slash + 1, '.') != NULL)
+               clp->m_addrlist[1].s_addr = inet_addr(slash + 1);
+       else {
+               int prefixlen = atoi(slash + 1);
+               if (0 < prefixlen && prefixlen <= 32)
+                       clp->m_addrlist[1].s_addr =
+                                       htonl((uint32_t)~0 << (32 - prefixlen));
+               else
+                       goto out_badprefix;
+       }
+
+       return 1;
+
+out_badprefix:
+       xlog(L_ERROR, "Invalid prefix `%s' for %s", slash + 1, clp->m_hostname);
+       return 0;
+}
+
+static int
+init_subnetwork(nfs_client *clp)
+{
+       static char slash32[] = "/32";
+       char *cp;
+
+       cp = strchr(clp->m_hostname, '/');
+       if (cp == NULL)
+               cp = slash32;
+
+       *cp = '\0';
+       clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname);
+       *cp = '/';
+
+       return init_netmask(clp, cp);
+}
+
+static int
+client_init(nfs_client *clp, const char *hname, const struct hostent *hp)
+{
+       clp->m_hostname = strdup(hname);
+       if (clp->m_hostname == NULL)
+               return 0;
+
+       clp->m_exported = 0;
+       clp->m_count = 0;
+       clp->m_naddr = 0;
+
+       if (clp->m_type == MCL_SUBNETWORK)
+               return init_subnetwork(clp);
+
+       init_addrlist(clp, hp);
+       return 1;
+}
+
 /* if canonical is set, then we *know* this is already a canonical name
  * so hostname lookup is avoided.
  * This is used when reading /proc/fs/nfs/exports
@@ -88,23 +165,23 @@ client_lookup(char *hname, int canonical)
                }
        }
 
-       if (!clp) {
-               clp = (nfs_client *) xmalloc(sizeof(*clp));
-               memset(clp, 0, sizeof(*clp));
+       if (clp == NULL) {
+               clp = calloc(1, sizeof(*clp));
+               if (clp == NULL)
+                       goto out;
                clp->m_type = htype;
-               client_init(clp, hname, NULL);
+               if (!client_init(clp, hname, NULL)) {
+                       client_free(clp);
+                       clp = NULL;
+                       goto out;
+               }
                client_add(clp);
        }
 
-       if (htype == MCL_FQDN && clp->m_naddr == 0 && hp != NULL) {
-               char    **ap = hp->h_addr_list;
-               int     i;
-
-               for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++)
-                       clp->m_addrlist[i] = *(struct in_addr *)*ap;
-               clp->m_naddr = i;
-       }
+       if (htype == MCL_FQDN && clp->m_naddr == 0)
+               init_addrlist(clp, hp);
 
+out:
        if (hp)
                free (hp);
 
@@ -116,64 +193,21 @@ client_dup(nfs_client *clp, struct hostent *hp)
 {
        nfs_client              *new;
 
-       new = (nfs_client *) xmalloc(sizeof(*new));
+       new = (nfs_client *)malloc(sizeof(*new));
+       if (new == NULL)
+               return NULL;
        memcpy(new, clp, sizeof(*new));
        new->m_type = MCL_FQDN;
        new->m_hostname = NULL;
 
-       client_init(new, (char *) hp->h_name, hp);
+       if (!client_init(new, hp->h_name, hp)) {
+               client_free(new);
+               return NULL;
+       }
        client_add(new);
        return new;
 }
 
-static void
-client_init(nfs_client *clp, const char *hname, struct hostent *hp)
-{
-       xfree(clp->m_hostname);
-       if (hp)
-               clp->m_hostname = xstrdup(hp->h_name);
-       else
-               clp->m_hostname = xstrdup(hname);
-
-       clp->m_exported = 0;
-       clp->m_count = 0;
-
-       if (clp->m_type == MCL_SUBNETWORK) {
-               char    *cp = strchr(clp->m_hostname, '/');
-               static char slash32[] = "/32";
-
-               if(!cp) cp = slash32;
-               *cp = '\0';
-               clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname);
-               if (strchr(cp + 1, '.')) {
-                       clp->m_addrlist[1].s_addr = inet_addr(cp+1);
-               }
-               else {
-                       int netmask = atoi(cp + 1);
-                       if (0 < netmask && netmask <= 32) {
-                               clp->m_addrlist[1].s_addr =
-                                       htonl ((uint32_t) ~0 << (32 - netmask));
-                       }
-                       else {
-                               xlog(L_FATAL, "invalid netmask `%s' for %s",
-                                    cp + 1, clp->m_hostname);
-                       }
-               }
-               *cp = '/';
-               clp->m_naddr = 0;
-       } else if (!hp) {
-               clp->m_naddr = 0;
-       } else {
-               char    **ap = hp->h_addr_list;
-               int     i;
-
-               for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++) {
-                       clp->m_addrlist[i] = *(struct in_addr *)*ap;
-               }
-               clp->m_naddr = i;
-       }
-}
-
 void
 client_add(nfs_client *clp)
 {
@@ -206,8 +240,7 @@ client_freeall(void)
                head = clientlist + i;
                while (*head) {
                        *head = (clp = *head)->m_next;
-                       xfree(clp->m_hostname);
-                       xfree(clp);
+                       client_free(clp);
                }
        }
 }
@@ -371,77 +404,113 @@ check_subnetwork(const nfs_client *clp, const struct hostent *hp)
 }
 
 /*
- * Match a host (given its hostent record) to a client record. This
- * is usually called from mountd.
+ * Check if a wildcard nfs_client record matches the canonical name
+ * or the aliases of a host.  Return 1 if a match is found, otherwise
+ * zero.
+ */
+static int
+check_wildcard(const nfs_client *clp, const struct hostent *hp)
+{
+       char *cname = clp->m_hostname;
+       char *hname = hp->h_name;
+       char **ap;
+
+       if (wildmat(hname, cname))
+               return 1;
+
+       /* See if hname aliases listed in /etc/hosts or nis[+]
+        * match the requested wildcard */
+       for (ap = hp->h_aliases; *ap; ap++) {
+               if (wildmat(*ap, cname))
+                       return 1;
+       }
+
+       return 0;
+}
+
+/*
+ * Check if @hp's hostname or aliases fall in a given netgroup.
+ * Return 1 if @hp represents a host in the netgroup, otherwise zero.
+ */
+#ifdef HAVE_INNETGR
+static int
+check_netgroup(const nfs_client *clp, const struct hostent *hp)
+{
+       const char *netgroup = clp->m_hostname + 1;
+       const char *hname = hp->h_name;
+       struct hostent *nhp = NULL;
+       struct sockaddr_in addr;
+       int match, i;
+       char *dot;
+
+       /* First, try to match the hostname without
+        * splitting off the domain */
+       if (innetgr(netgroup, hname, NULL, NULL))
+               return 1;
+
+       /* See if hname aliases listed in /etc/hosts or nis[+]
+        * match the requested netgroup */
+       for (i = 0; hp->h_aliases[i]; i++) {
+               if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL))
+                       return 1;
+       }
+
+       /* If hname is ip address convert to FQDN */
+       if (inet_aton(hname, &addr.sin_addr) &&
+          (nhp = gethostbyaddr((const char *)&(addr.sin_addr),
+           sizeof(addr.sin_addr), AF_INET))) {
+               hname = nhp->h_name;
+               if (innetgr(netgroup, hname, NULL, NULL))
+                       return 1;
+       }
+
+       /* Okay, strip off the domain (if we have one) */
+       dot = strchr(hname, '.');
+       if (dot == NULL)
+               return 0;
+
+       *dot = '\0';
+       match = innetgr(netgroup, hname, NULL, NULL);
+       *dot = '.';
+
+       return match;
+}
+#else  /* !HAVE_INNETGR */
+static int
+check_netgroup(__attribute__((unused)) const nfs_client *clp,
+               __attribute__((unused)) const struct hostent *hp)
+{
+       return 0;
+}
+#endif /* !HAVE_INNETGR */
+
+/**
+ * client_check - check if IP address information matches a cached nfs_client
+ * @clp: pointer to a cached nfs_client record
+ * @hp: pointer to hostent containing host IP information
+ *
+ * Returns 1 if the address information matches the cached nfs_client,
+ * otherwise zero.
  */
 int
 client_check(nfs_client *clp, struct hostent *hp)
 {
-       char    *hname = (char *) hp->h_name;
-       char    *cname = clp->m_hostname;
-       char    **ap;
-
        switch (clp->m_type) {
        case MCL_FQDN:
                return check_fqdn(clp, hp);
        case MCL_SUBNETWORK:
                return check_subnetwork(clp, hp);
        case MCL_WILDCARD:
-               if (wildmat(hname, cname))
-                       return 1;
-               else {
-                       for (ap = hp->h_aliases; *ap; ap++)
-                               if (wildmat(*ap, cname))
-                                       return 1;
-               }
-               return 0;
+               return check_wildcard(clp, hp);
        case MCL_NETGROUP:
-#ifdef HAVE_INNETGR
-               {
-                       char    *dot;
-                       int     match, i;
-                       struct hostent *nhp = NULL;
-                       struct sockaddr_in addr;
-
-                       /* First, try to match the hostname without
-                        * splitting off the domain */
-                       if (innetgr(cname+1, hname, NULL, NULL))
-                               return 1;
-
-                       /* try the aliases as well */
-                       for (i = 0; hp->h_aliases[i]; i++) {
-                               if (innetgr(cname+1, hp->h_aliases[i], NULL, NULL))
-                                       return 1;
-                       }
-
-                       /* If hname is ip address convert to FQDN */
-                       if (inet_aton(hname, &addr.sin_addr) &&
-                          (nhp = gethostbyaddr((const char *)&(addr.sin_addr),
-                           sizeof(addr.sin_addr), AF_INET))) {
-                               hname = (char *)nhp->h_name;
-                               if (innetgr(cname+1, hname, NULL, NULL))
-                                       return 1;
-                       }
-
-                       /* Okay, strip off the domain (if we have one) */
-                       if ((dot = strchr(hname, '.')) == NULL)
-                               return 0;
-
-                       *dot = '\0';
-                       match = innetgr(cname+1, hname, NULL, NULL);
-                       *dot = '.';
-
-                       return match;
-               }
-#else
-               return 0;
-#endif
+               return check_netgroup(clp, hp);
        case MCL_ANONYMOUS:
                return 1;
        case MCL_GSS:
                return 0;
        default:
-               xlog(L_FATAL, "internal: bad client type %d", clp->m_type);
+               xlog(D_GENERAL, "%s: unrecognized client type: %d",
+                               __func__, clp->m_type);
        }
 
        return 0;