From: Chuck Lever Date: Mon, 18 May 2009 17:27:25 +0000 (-0400) Subject: nfs-utils: Fix IPv6 support in support/nfs/rpc_socket.c X-Git-Tag: nfs-utils-1-1-7-rc1~1 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=383a026d99624c88c0e802103ef4c4865db8eb71;p=nfs-utils.git 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 Signed-off-by: Steve Dickson --- diff --git a/support/nfs/rpc_socket.c b/support/nfs/rpc_socket.c index 85e6064..cebf83d 100644 --- 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.