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

Take the first step towards making it possible to parse either IPv4 or
IPv6 addresses in client_init().  It won't handle IPv6 until
host_pton() has IPv6 support enabled, and it still doesn't deal with
IPv6 netmasks yet.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/export/client.c b/support/export/client.c
index 3e797c94f3d024f417ad54aefc74076732268e06..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)
 {
 static int
 init_subnetwork(nfs_client *clp)
 {

-       struct sockaddr_in sin = {
-               .sin_family             = AF_INET,
-       };

        static char slash32[] = "/32";
        static char slash32[] = "/32";

+       struct addrinfo *ai;

        char *cp;
 
        cp = strchr(clp->m_hostname, '/');
        char *cp;
 
        cp = strchr(clp->m_hostname, '/');


@@ -97,9 +95,14 @@ init_subnetwork(nfs_client *clp)
                cp = slash32;
 
        *cp = '\0';
                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 = '/';
        *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);
 }
 
        return init_netmask(clp, cp);
 }