nfs-utils: Fix IPv6 support in support/nfs/rpc_socket.c

Use the correct #ifdef variable to enable IPv6 support for privileged
RPC clients.  Without this fix, unmounting an IPv6 NFSv2/v3 server
fails.

Introduced by commit 8c94296bc84f3a204f2061c0391a1d2350e4f37e.

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

diff --git a/support/nfs/rpc_socket.c b/support/nfs/rpc_socket.c
index 85e60641941c19dd2fc9875641c3e10c0ef4b553..cebf83ddc71c94f9e68cba8c9c761d2ab2fdf25d 100644 (file)
--- a/support/nfs/rpc_socket.c
+++ b/support/nfs/rpc_socket.c
@@ -132,7 +132,7 @@ static int nfs_bind(const int sock, const sa_family_t family)
        return -1;
 }
 
-#ifdef IPV6_SUPPORT
+#ifdef IPV6_SUPPORTED
 
 /*
  * Bind a socket using an unused privileged source port.
@@ -153,18 +153,16 @@ static int nfs_bindresvport(const int sock, const sa_family_t family)
 
        switch (family) {
        case AF_INET:
-               return bindresvport_sa(sock, (struct sockaddr *)&sin,
-                                       (socklen_t)sizeof(sin));
+               return bindresvport_sa(sock, (struct sockaddr *)&sin);
        case AF_INET6:
-               return bindresvport_sa(sock, (struct sockaddr *)&sin6,
-                                       (socklen_t)sizeof(sin6));
+               return bindresvport_sa(sock, (struct sockaddr *)&sin6);
        }
 
        errno = EAFNOSUPPORT;
        return -1;
 }
 
-#else  /* !IPV6_SUPPORT */
+#else  /* !IPV6_SUPPORTED */
 
 /*
  * Bind a socket using an unused privileged source port.
@@ -182,7 +180,7 @@ static int nfs_bindresvport(const int sock, const sa_family_t family)
        return bindresvport(sock, NULL);
 }
 
-#endif /* !IPV6_SUPPORT */
+#endif /* !IPV6_SUPPORTED */
 
 /*
  * Perform a non-blocking connect on the socket fd.