libexport.a: Use host helper to parse address in client_init()

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

diff --git a/support/export/client.c b/support/export/client.c
index b1a3a09d680d32b2f5e70aaf3c847bf4b1b0b18f..a89142de2e1cc11f173ab78e39dc5bc70251c9c4 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -86,10 +86,8 @@ out_badprefix:
 static int
 init_subnetwork(nfs_client *clp)
 {
-       struct sockaddr_in sin = {
-               .sin_family             = AF_INET,
-       };
        static char slash32[] = "/32";
+       struct addrinfo *ai;
        char *cp;
 
        cp = strchr(clp->m_hostname, '/');
@@ -97,9 +95,14 @@ init_subnetwork(nfs_client *clp)
                cp = slash32;
 
        *cp = '\0';
-       sin.sin_addr.s_addr = inet_addr(clp->m_hostname);
-       set_addrlist_in(clp, 0, &sin);
+       ai = host_pton(clp->m_hostname);
        *cp = '/';
+       if (ai == NULL) {
+               xlog(L_ERROR, "Invalid IP address %s", clp->m_hostname);
+               return false;
+       }
+       set_addrlist(clp, 0, ai->ai_addr);
+       freeaddrinfo(ai);
 
        return init_netmask(clp, cp);
 }
@@ -490,14 +493,19 @@ static int
 check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
 {
        const char *netgroup = clp->m_hostname + 1;
-       const char *hname = ai->ai_canonname;
        struct addrinfo *tmp = NULL;
        struct hostent *hp;
+       char *dot, *hname;
        int i, match;
-       char *dot;
 
        match = 0;
 
+       hname = strdup(ai->ai_canonname);
+       if (hname == NULL) {
+               xlog(D_GENERAL, "%s: no memory for strdup", __func__);
+               goto out;
+       }
+
        /* First, try to match the hostname without
         * splitting off the domain */
        if (innetgr(netgroup, hname, NULL, NULL)) {
@@ -516,13 +524,21 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
                        }
        }
 
-       /* If hname is ip address convert to FQDN */
+       /* If hname happens to be an IP address, convert it
+        * to a the canonical DNS name bound to this address. */
        tmp = host_pton(hname);
        if (tmp != NULL) {
+               char *cname = host_canonname(tmp->ai_addr);
                freeaddrinfo(tmp);
-               if (innetgr(netgroup, hname, NULL, NULL)) {
-                       match = 1;
-                       goto out;
+
+               /* The resulting FQDN may be in our netgroup. */
+               if (cname != NULL) {
+                       free(hname);
+                       hname = cname;
+                       if (innetgr(netgroup, hname, NULL, NULL)) {
+                               match = 1;
+                               goto out;
+                       }
                }
        }
 
@@ -533,9 +549,9 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
 
        *dot = '\0';
        match = innetgr(netgroup, hname, NULL, NULL);
-       *dot = '.';
 
 out:
+       free(hname);
        return match;
 }
 #else  /* !HAVE_INNETGR */
@@ -589,7 +605,8 @@ client_check(const nfs_client *clp, const struct addrinfo *ai)
 int
 client_gettype(char *ident)
 {
-       char    *sp;
+       struct addrinfo *ai;
+       char *sp;
 
        if (ident[0] == '\0' || strcmp(ident, "*")==0)
                return MCL_ANONYMOUS;
@@ -609,12 +626,16 @@ client_gettype(char *ident)
                if (*sp == '\\' && sp[1])
                        sp++;
        }
-       /* check for N.N.N.N */
-       sp = ident;
-       if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
-       sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
-       sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '.') return MCL_FQDN;
-       sp++; if(!isdigit(*sp) || strtoul(sp, &sp, 10) > 255 || *sp != '\0') return MCL_FQDN;
-       /* we lie here a bit. but technically N.N.N.N == N.N.N.N/32 :) */
-       return MCL_SUBNETWORK;
+
+       /*
+        * Treat unadorned IP addresses as MCL_SUBNETWORK.
+        * Everything else is MCL_FQDN.
+        */
+       ai = host_pton(ident);
+       if (ai != NULL) {
+               freeaddrinfo(ai);
+               return MCL_SUBNETWORK;
+       }
+
+       return MCL_FQDN;
 }