diff --git a/.gitignore b/.gitignore

index cfc329a..632609e 100644

--- a/.gitignore

+++ b/.gitignore

@@ -13,6 +13,11 @@ ltmain.sh

 Makefile.in

 missing

 support/include/config.h.in

+aclocal/libtool.m4

+aclocal/ltoptions.m4

+aclocal/ltsugar.m4

+aclocal/ltversion.m4

+aclocal/lt~obsolete.m4

 # files generated by configure

 confdefs.h

 config.status

diff --git a/support/include/nfsrpc.h b/support/include/nfsrpc.h

index 543c35b..dff6af7 100644

--- a/support/include/nfsrpc.h

+++ b/support/include/nfsrpc.h

@@ -49,6 +49,25 @@

 #define NSMPROG		((rpcprog_t)100024)

 #endif

+/**

+ * nfs_clear_rpc_createerr - zap all error reporting fields

+ *

+ */

+static inline void nfs_clear_rpc_createerr(void)

+{

+	memset(&rpc_createerr, 0, sizeof(rpc_createerr));

+}

+

+/*

+ * Extract port value from a socket address

+ */

+extern uint16_t		nfs_get_port(const struct sockaddr *);

+

+/*

+ * Set port value in a socket address

+ */

+extern void		nfs_set_port(struct sockaddr *, const uint16_t);

+

 /*

  * Look up an RPC program name in /etc/rpc

  */

@@ -73,8 +92,7 @@ extern CLIENT		*nfs_get_priv_rpcclient( const struct sockaddr *,

 /*

  * Convert a socket address to a universal address

  */

-extern char		*nfs_sockaddr2universal(const struct sockaddr *,

-				const socklen_t);

+extern char		*nfs_sockaddr2universal(const struct sockaddr *);

 /*

  * Extract port number from a universal address

@@ -114,7 +132,6 @@ extern unsigned short	nfs_rpcb_getaddr(const struct sockaddr *,

 				const socklen_t,

 				const unsigned short,

 				const struct sockaddr *,

-				const socklen_t,

 				const rpcprog_t,

 				const rpcvers_t,

 				const unsigned short,

diff --git a/support/nfs/getport.c b/support/nfs/getport.c

index cf1677e..4bdf556 100644

--- a/support/nfs/getport.c

+++ b/support/nfs/getport.c

@@ -65,77 +65,52 @@ static const rpcvers_t default_rpcb_version = RPCBVERS_4;

 static const rpcvers_t default_rpcb_version = PMAPVERS;

 #endif	/* !HAVE_LIBTIRPC */

-#ifdef HAVE_DECL_AI_ADDRCONFIG

 /*

- * getaddrinfo(3) generates a usable loopback address based on how the

- * local network interfaces are configured.  RFC 3484 requires that the

- * results are sorted so that the first result has the best likelihood

- * of working, so we try just that first result.

+ * Historical: Map TCP connect timeouts to timeout

+ * error code used by UDP.

+ */

+static void

+nfs_gp_map_tcp_errorcodes(const unsigned short protocol)

+{

+	if (protocol != IPPROTO_TCP)

+		return;

+

+	switch (rpc_createerr.cf_error.re_errno) {

+	case ETIMEDOUT:

+		rpc_createerr.cf_stat = RPC_TIMEDOUT;

+		break;

+	case ECONNREFUSED:

+		rpc_createerr.cf_stat = RPC_CANTRECV;

+		break;

+	}

+}

+

+/*

+ * There's no easy way to tell how the local system's networking

+ * and rpcbind is configured (ie. whether we want to use IPv6 or

+ * IPv4 loopback to contact RPC services on the local host).  We

+ * punt and simply try to look up "localhost".

  *

  * Returns TRUE on success.

  */

 static int nfs_gp_loopback_address(struct sockaddr *sap, socklen_t *salen)

 {

 	struct addrinfo *gai_results;

-	struct addrinfo gai_hint = {

-		.ai_flags	= AI_ADDRCONFIG,

-	};

-	socklen_t len = *salen;

 	int ret = 0;

-	if (getaddrinfo(NULL, "sunrpc", &gai_hint, &gai_results))

+	if (getaddrinfo("localhost", NULL, NULL, &gai_results))

 		return 0;

-	switch (gai_results->ai_addr->sa_family) {

-	case AF_INET:

-	case AF_INET6:

-		if (len >= gai_results->ai_addrlen) {

-			memcpy(sap, gai_results->ai_addr,

-					gai_results->ai_addrlen);

-			*salen = gai_results->ai_addrlen;

-			ret = 1;

-		}

+	if (*salen >= gai_results->ai_addrlen) {

+		memcpy(sap, gai_results->ai_addr,

+				gai_results->ai_addrlen);

+		*salen = gai_results->ai_addrlen;

+		ret = 1;

 	}

 	freeaddrinfo(gai_results);

 	return ret;

 }

-#else

-/*

- * Old versions of getaddrinfo(3) don't support AI_ADDRCONFIG, so we

- * have a fallback for building on legacy systems.

- */

-static int nfs_gp_loopback_address(struct sockaddr *sap, socklen_t *salen)

-{

-	struct sockaddr_in *sin = (struct sockaddr_in *)sap;

-

-	memset(sin, 0, sizeof(*sin));

-

-	sin->sin_family = AF_INET;

-	sin->sin_addr.s_addr = htonl(INADDR_LOOPBACK);

-	*salen = sizeof(*sin);

-

-	return 1;

-}

-#endif

-

-/*

- * Plant port number in @sap.  @port is already in network byte order.

- */

-static void nfs_gp_set_port(struct sockaddr *sap, const in_port_t port)

-{

-	struct sockaddr_in *sin = (struct sockaddr_in *)sap;

-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;

-

-	switch (sap->sa_family) {

-	case AF_INET:

-		sin->sin_port = port;

-		break;

-	case AF_INET6:

-		sin6->sin6_port = port;

-		break;

-	}

-}

 /*

  * Look up a network service in /etc/services and return the

@@ -201,7 +176,7 @@ static in_port_t nfs_gp_get_rpcb_port(const unsigned short protocol)

  * client.  Otherwise returns NULL, and rpc_createerr.cf_stat is set to

  * reflect the error.

  */

-static CLIENT *nfs_gp_get_rpcbclient(const struct sockaddr *sap,

+static CLIENT *nfs_gp_get_rpcbclient(struct sockaddr *sap,

 				     const socklen_t salen,

 				     const unsigned short transport,

 				     const rpcvers_t version,

@@ -214,15 +189,14 @@ static CLIENT *nfs_gp_get_rpcbclient(const struct sockaddr *sap,

 		"sunrpc",

 		NULL,

 	};

-	struct sockaddr_storage address;

-	struct sockaddr *saddr = (struct sockaddr *)&address;

 	rpcprog_t rpcb_prog = nfs_getrpcbyname(RPCBPROG, rpcb_pgmtbl);

+	CLIENT *clnt;

-	memcpy(saddr, sap, (size_t)salen);

-	nfs_gp_set_port(saddr, nfs_gp_get_rpcb_port(transport));

-

-	return nfs_get_rpcclient(saddr, salen, transport, rpcb_prog,

-					version, timeout);

+	nfs_set_port(sap, ntohs(nfs_gp_get_rpcb_port(transport)));

+	clnt = nfs_get_rpcclient(sap, salen, transport, rpcb_prog,

+							version, timeout);

+	nfs_gp_map_tcp_errorcodes(transport);

+	return clnt;

 }

 /*

@@ -352,7 +326,6 @@ int nfs_universal2port(const char *uaddr)

 /**

  * nfs_sockaddr2universal - convert a sockaddr to a "universal address"

  * @sap: pointer to a socket address

- * @salen: length of socket address

  *

  * Universal addresses (defined in RFC 1833) are used when calling an

  * rpcbind daemon via protocol versions 3 or 4..

@@ -361,81 +334,56 @@ int nfs_universal2port(const char *uaddr)

  * the returned string.  Otherwise NULL is returned and

  * rpc_createerr.cf_stat is set to reflect the error.

  *

+ * inet_ntop(3) is used here, since getnameinfo(3) is not available

+ * in some earlier glibc releases, and we don't require support for

+ * scope IDs for universal addresses.

  */

-#ifdef HAVE_GETNAMEINFO

-

-char *nfs_sockaddr2universal(const struct sockaddr *sap,

-			     const socklen_t salen)

+char *nfs_sockaddr2universal(const struct sockaddr *sap)

 {

-	struct sockaddr_un *sun = (struct sockaddr_un *)sap;

-	char buf[NI_MAXHOST];

+	const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sap;

+	const struct sockaddr_un *sun = (const struct sockaddr_un *)sap;

+	const struct sockaddr_in *sin = (const struct sockaddr_in *)sap;

+	char buf[INET6_ADDRSTRLEN + 8 /* for port information */];

 	uint16_t port;

+	size_t count;

+	char *result;

+	int len;

 	switch (sap->sa_family) {

 	case AF_LOCAL:

 		return strndup(sun->sun_path, sizeof(sun->sun_path));

 	case AF_INET:

-		if (getnameinfo(sap, salen, buf, (socklen_t)sizeof(buf),

-					NULL, 0, NI_NUMERICHOST) != 0)

+		if (inet_ntop(AF_INET, (const void *)&sin->sin_addr.s_addr,

+					buf, (socklen_t)sizeof(buf)) == NULL)

 			goto out_err;

-		port = ntohs(((struct sockaddr_in *)sap)->sin_port);

+		port = ntohs(sin->sin_port);

 		break;

 	case AF_INET6:

-		if (getnameinfo(sap, salen, buf, (socklen_t)sizeof(buf),

-					NULL, 0, NI_NUMERICHOST) != 0)

+		if (inet_ntop(AF_INET6, (const void *)&sin6->sin6_addr,

+					buf, (socklen_t)sizeof(buf)) == NULL)

 			goto out_err;

-		port = ntohs(((struct sockaddr_in6 *)sap)->sin6_port);

+		port = ntohs(sin6->sin6_port);

 		break;

 	default:

 		goto out_err;

 	}

-	(void)snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ".%u.%u",

+	count = sizeof(buf) - strlen(buf);

+	len = snprintf(buf + strlen(buf), count, ".%u.%u",

 			(unsigned)(port >> 8), (unsigned)(port & 0xff));

-

-	return strdup(buf);

-

-out_err:

-	rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;

-	return NULL;

-}

-

-#else	/* HAVE_GETNAMEINFO */

-

-char *nfs_sockaddr2universal(const struct sockaddr *sap,

-			     const socklen_t salen)

-{

-	struct sockaddr_un *sun = (struct sockaddr_un *)sap;

-	char buf[NI_MAXHOST];

-	uint16_t port;

-	char *addr;

-

-	switch (sap->sa_family) {

-	case AF_LOCAL:

-		return strndup(sun->sun_path, sizeof(sun->sun_path));

-	case AF_INET:

-		addr = inet_ntoa(((struct sockaddr_in *)sap)->sin_addr);

-		if (addr != NULL && strlen(addr) > sizeof(buf))

-			goto out_err;

-		strcpy(buf, addr);

-		port = ntohs(((struct sockaddr_in *)sap)->sin_port);

-		break;

-	default:

+	/* before glibc 2.0.6, snprintf(3) could return -1 */

+	if (len < 0 || (size_t)len > count)

 		goto out_err;

-	}

-	(void)snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ".%u.%u",

-			(unsigned)(port >> 8), (unsigned)(port & 0xff));

-

-	return strdup(buf);

+	result = strdup(buf);

+	if (result != NULL)

+		return result;

 out_err:

 	rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;

 	return NULL;

 }

-#endif	/* HAVE_GETNAMEINFO */

-

 /*

  * Send a NULL request to the indicated RPC service.

  *

@@ -450,6 +398,10 @@ static int nfs_gp_ping(CLIENT *client, struct timeval timeout)

 			   (xdrproc_t)xdr_void, NULL,

 			   timeout);

+	if (status != RPC_SUCCESS) {

+		rpc_createerr.cf_stat = status;

+		CLNT_GETERR(client, &rpc_createerr.cf_error);

+	}

 	return (int)(status == RPC_SUCCESS);

 }

@@ -458,15 +410,10 @@ static int nfs_gp_ping(CLIENT *client, struct timeval timeout)

 /*

  * Initialize the rpcb argument for a GETADDR request.

  *

- * The rpcbind daemon ignores the parms.r_owner field in GETADDR

- * requests, but we plant an eye-catcher to help distinguish these

- * requests in network traces.

- *

  * Returns 1 if successful, and caller must free strings pointed

  * to by r_netid and r_addr; otherwise 0.

  */

 static int nfs_gp_init_rpcb_parms(const struct sockaddr *sap,

-				  const socklen_t salen,

 				  const rpcprog_t program,

 				  const rpcvers_t version,

 				  const unsigned short protocol,

@@ -478,7 +425,7 @@ static int nfs_gp_init_rpcb_parms(const struct sockaddr *sap,

 	if (netid == NULL)

 		return 0;

-	addr = nfs_sockaddr2universal(sap, salen);

+	addr = nfs_sockaddr2universal(sap);

 	if (addr == NULL) {

 		free(netid);

 		return 0;

@@ -489,7 +436,7 @@ static int nfs_gp_init_rpcb_parms(const struct sockaddr *sap,

 	parms->r_vers	= version;

 	parms->r_netid	= netid;

 	parms->r_addr	= addr;

-	parms->r_owner	= "nfs-utils";	/* eye-catcher */

+	parms->r_owner	= "";

 	return 1;

 }

@@ -531,7 +478,7 @@ static unsigned short nfs_gp_rpcb_getaddr(CLIENT *client,

 		case RPC_SUCCESS:

 			if ((uaddr == NULL) || (uaddr[0] == '\0')) {

 				rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;

-				continue;

+				return 0;

 			}

 			port = nfs_universal2port(uaddr);

@@ -587,7 +534,7 @@ static unsigned long nfs_gp_pmap_getport(CLIENT *client,

 	if (status != RPC_SUCCESS) {

 		rpc_createerr.cf_stat = status;

-		clnt_geterr(client, &rpc_createerr.cf_error);

+		CLNT_GETERR(client, &rpc_createerr.cf_error);

 		port = 0;

 	} else if (port == 0)

 		rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;

@@ -599,7 +546,6 @@ static unsigned long nfs_gp_pmap_getport(CLIENT *client,

 static unsigned short nfs_gp_getport_rpcb(CLIENT *client,

 					  const struct sockaddr *sap,

-					  const socklen_t salen,

 					  const rpcprog_t program,

 					  const rpcvers_t version,

 					  const unsigned short protocol,

@@ -608,8 +554,8 @@ static unsigned short nfs_gp_getport_rpcb(CLIENT *client,

 	unsigned short port = 0;

 	struct rpcb parms;

-	if (nfs_gp_init_rpcb_parms(sap, salen, program,

-					version, protocol, &parms) != 0) {

+	if (nfs_gp_init_rpcb_parms(sap, program, version,

+					protocol, &parms) != 0) {

 		port = nfs_gp_rpcb_getaddr(client, &parms, timeout);

 		nfs_gp_free_rpcb_parms(&parms);

 	}

@@ -645,7 +591,6 @@ static unsigned long nfs_gp_getport_pmap(CLIENT *client,

  */

 static unsigned short nfs_gp_getport(CLIENT *client,

 				     const struct sockaddr *sap,

-				     const socklen_t salen,

 				     const rpcprog_t program,

 				     const rpcvers_t version,

 				     const unsigned short protocol,

@@ -654,7 +599,7 @@ static unsigned short nfs_gp_getport(CLIENT *client,

 	switch (sap->sa_family) {

 #ifdef HAVE_LIBTIRPC

 	case AF_INET6:

-		return nfs_gp_getport_rpcb(client, sap, salen, program,

+		return nfs_gp_getport_rpcb(client, sap, program,

 						version, protocol, timeout);

 #endif	/* HAVE_LIBTIRPC */

 	case AF_INET:

@@ -667,7 +612,7 @@ static unsigned short nfs_gp_getport(CLIENT *client,

 }

 /**

- * nfs_rcp_ping - Determine if RPC service is responding to requests

+ * nfs_rpc_ping - Determine if RPC service is responding to requests

  * @sap: pointer to address of server to query (port is already filled in)

  * @salen: length of server address

  * @program: requested RPC program number

@@ -682,6 +627,8 @@ int nfs_rpc_ping(const struct sockaddr *sap, const socklen_t salen,

 		 const rpcprog_t program, const rpcvers_t version,

 		 const unsigned short protocol, const struct timeval *timeout)

 {

+	struct sockaddr_storage address;

+	struct sockaddr *saddr = (struct sockaddr *)&address;

 	CLIENT *client;

 	struct timeval tout = { -1, 0 };

 	int result = 0;

@@ -689,9 +636,14 @@ int nfs_rpc_ping(const struct sockaddr *sap, const socklen_t salen,

 	if (timeout != NULL)

 		tout = *timeout;

-	client = nfs_get_rpcclient(sap, salen, protocol, program, version, &tout);

+	nfs_clear_rpc_createerr();

+

+	memcpy(saddr, sap, (size_t)salen);

+	client = nfs_get_rpcclient(saddr, salen, protocol,

+						program, version, &tout);

 	if (client != NULL) {

 		result = nfs_gp_ping(client, tout);

+		nfs_gp_map_tcp_errorcodes(protocol);

 		CLNT_DESTROY(client);

 	}

@@ -744,14 +696,19 @@ unsigned short nfs_getport(const struct sockaddr *sap,

 			   const rpcvers_t version,

 			   const unsigned short protocol)

 {

+	struct sockaddr_storage address;

+	struct sockaddr *saddr = (struct sockaddr *)&address;

 	struct timeval timeout = { -1, 0 };

 	unsigned short port = 0;

 	CLIENT *client;

-	client = nfs_gp_get_rpcbclient(sap, salen, protocol,

+	nfs_clear_rpc_createerr();

+

+	memcpy(saddr, sap, (size_t)salen);

+	client = nfs_gp_get_rpcbclient(saddr, salen, protocol,

 						default_rpcb_version, &timeout);

 	if (client != NULL) {

-		port = nfs_gp_getport(client, sap, salen, program,

+		port = nfs_gp_getport(client, saddr, program,

 					version, protocol, timeout);

 		CLNT_DESTROY(client);

 	}

@@ -786,10 +743,12 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen,

 	CLIENT *client;

 	int result = 0;

+	nfs_clear_rpc_createerr();

+

 	client = nfs_gp_get_rpcbclient(sap, salen, protocol,

 						default_rpcb_version, &timeout);

 	if (client != NULL) {

-		port = nfs_gp_getport(client, sap, salen, program,

+		port = nfs_gp_getport(client, sap, program,

 					version, protocol, timeout);

 		CLNT_DESTROY(client);

 		client = NULL;

@@ -800,18 +759,21 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen,

 		struct sockaddr *saddr = (struct sockaddr *)&address;

 		memcpy(saddr, sap, (size_t)salen);

-		nfs_gp_set_port(saddr, htons(port));

+		nfs_set_port(saddr, port);

+

+		nfs_clear_rpc_createerr();

 		client = nfs_get_rpcclient(saddr, salen, protocol,

 						program, version, &timeout);

 		if (client != NULL) {

 			result = nfs_gp_ping(client, timeout);

+			nfs_gp_map_tcp_errorcodes(protocol);

 			CLNT_DESTROY(client);

 		}

 	}

 	if (result)

-		nfs_gp_set_port(sap, htons(port));

+		nfs_set_port(sap, port);

 	return result;

 }

@@ -840,13 +802,6 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen,

  * isn't listening on /var/run/rpcbind.sock), send a query via UDP to localhost

  * (UDP doesn't leave a socket in TIME_WAIT, and the timeout is a relatively

  * short 3 seconds).

- *

- * getaddrinfo(3) generates a usable loopback address.  RFC 3484 requires that

- * the results are sorted so that the first result has the best likelihood of

- * working, so we try just that first result.  If IPv6 is all that is

- * available, we are sure to generate an AF_INET6 loopback address and use

- * rpcbindv4/v3 GETADDR.  AF_INET6 requests go via rpcbind v4/3 in order to

- * detect if the requested RPC service supports AF_INET6 or not.

  */

 unsigned short nfs_getlocalport(const rpcprot_t program,

 				const rpcvers_t version,

@@ -867,11 +822,13 @@ unsigned short nfs_getlocalport(const rpcprot_t program,

 	CLIENT *client;

 	struct timeval timeout = { -1, 0 };

+	nfs_clear_rpc_createerr();

+

 	client = nfs_gp_get_rpcbclient(sap, salen, 0, RPCBVERS_4, &timeout);

 	if (client != NULL) {

 		struct rpcb parms;

-		if (nfs_gp_init_rpcb_parms(sap, salen, program, version,

+		if (nfs_gp_init_rpcb_parms(sap, program, version,

 						protocol, &parms) != 0) {

 			port = nfs_gp_rpcb_getaddr(client, &parms, timeout);

 			nfs_gp_free_rpcb_parms(&parms);

@@ -881,6 +838,8 @@ unsigned short nfs_getlocalport(const rpcprot_t program,

 #endif	/* NFS_GP_LOCAL */

 	if (port == 0) {

+		nfs_clear_rpc_createerr();

+

 		if (nfs_gp_loopback_address(lb_addr, &lb_len)) {

 			port = nfs_getport(lb_addr, lb_len,

 						program, version, protocol);

@@ -897,7 +856,6 @@ unsigned short nfs_getlocalport(const rpcprot_t program,

  * @salen: length of server address

  * @transport: transport protocol to use for the query

  * @addr: pointer to r_addr address

- * @addrlen: length of address

  * @program: requested RPC program number

  * @version: requested RPC version number

  * @protocol: requested IPPROTO_ value of transport protocol

@@ -928,12 +886,13 @@ unsigned short nfs_rpcb_getaddr(const struct sockaddr *sap,

 				const socklen_t salen,

 				const unsigned short transport,

 				const struct sockaddr *addr,

-				const socklen_t addrlen,

 				const rpcprog_t program,

 				const rpcvers_t version,

 				const unsigned short protocol,

 				const struct timeval *timeout)

 {

+	struct sockaddr_storage address;

+	struct sockaddr *saddr = (struct sockaddr *)&address;

 	CLIENT *client;

 	struct rpcb parms;

 	struct timeval tout = { -1, 0 };

@@ -942,9 +901,13 @@ unsigned short nfs_rpcb_getaddr(const struct sockaddr *sap,

 	if (timeout != NULL)

 		tout = *timeout;

-	client = nfs_gp_get_rpcbclient(sap, salen, transport, RPCBVERS_4, &tout);

+	nfs_clear_rpc_createerr();

+

+	memcpy(saddr, sap, (size_t)salen);

+	client = nfs_gp_get_rpcbclient(saddr, salen, transport,

+							RPCBVERS_4, &tout);

 	if (client != NULL) {

-		if (nfs_gp_init_rpcb_parms(addr, addrlen, program, version,

+		if (nfs_gp_init_rpcb_parms(addr, program, version,

 						protocol, &parms) != 0) {

 			port = nfs_gp_rpcb_getaddr(client, &parms, tout);

 			nfs_gp_free_rpcb_parms(&parms);

@@ -957,16 +920,17 @@ unsigned short nfs_rpcb_getaddr(const struct sockaddr *sap,

 #else	/* !HAVE_LIBTIRPC */

-unsigned short nfs_rpcb_getaddr(const struct sockaddr *sap,

-				const socklen_t salen,

-				const unsigned short transport,

-				const struct sockaddr *addr,

-				const socklen_t addrlen,

-				const rpcprog_t program,

-				const rpcvers_t version,

-				const unsigned short protocol,

-				const struct timeval *timeout)

+unsigned short nfs_rpcb_getaddr(__attribute__((unused)) const struct sockaddr *sap,

+				__attribute__((unused)) const socklen_t salen,

+				__attribute__((unused)) const unsigned short transport,

+				__attribute__((unused)) const struct sockaddr *addr,

+				__attribute__((unused)) const rpcprog_t program,

+				__attribute__((unused)) const rpcvers_t version,

+				__attribute__((unused)) const unsigned short protocol,

+				__attribute__((unused)) const struct timeval *timeout)

 {

+	nfs_clear_rpc_createerr();

+

 	rpc_createerr.cf_stat = RPC_UNKNOWNADDR;

 	return 0;

 }

@@ -1008,6 +972,8 @@ unsigned long nfs_pmap_getport(const struct sockaddr_in *sin,

 			       const unsigned long protocol,

 			       const struct timeval *timeout)

 {

+	struct sockaddr_in address;

+	struct sockaddr *saddr = (struct sockaddr *)&address;

 	CLIENT *client;

 	struct pmap parms = {

 		.pm_prog	= program,

@@ -1020,8 +986,10 @@ unsigned long nfs_pmap_getport(const struct sockaddr_in *sin,

 	if (timeout != NULL)

 		tout = *timeout;

-	client = nfs_gp_get_rpcbclient((struct sockaddr *)sin,

-					(socklen_t)sizeof(*sin),

+	nfs_clear_rpc_createerr();

+

+	memcpy(saddr, sin, sizeof(address));

+	client = nfs_gp_get_rpcbclient(saddr, (socklen_t)sizeof(*sin),

 					transport, PMAPVERS, &tout);

 	if (client != NULL) {

 		port = nfs_gp_pmap_getport(client, &parms, tout);

diff --git a/support/nfs/rpc_socket.c b/support/nfs/rpc_socket.c

index cebf83d..9c20f61 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_SUPPORTED

+#ifdef HAVE_LIBTIRPC

 /*

  * Bind a socket using an unused privileged source port.

@@ -162,7 +162,7 @@ static int nfs_bindresvport(const int sock, const sa_family_t family)

 	return -1;

 }

-#else	/* !IPV6_SUPPORTED */

+#else	/* !HAVE_LIBTIRPC */

 /*

  * Bind a socket using an unused privileged source port.

@@ -180,7 +180,7 @@ static int nfs_bindresvport(const int sock, const sa_family_t family)

 	return bindresvport(sock, NULL);

 }

-#endif	/* !IPV6_SUPPORTED */

+#endif	/* !HAVE_LIBTIRPC */

 /*

  * Perform a non-blocking connect on the socket fd.

@@ -326,7 +326,9 @@ static CLIENT *nfs_get_udpclient(const struct sockaddr *sap,

 					version, *timeout, &sock);

 #endif	/* !HAVE_LIBTIRPC */

 	if (client != NULL) {

-		CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)timeout);

+		struct timeval retry_timeout = { 1, 0 };

+		CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT,

+						(char *)&retry_timeout);

 		CLNT_CONTROL(client, CLSET_FD_CLOSE, NULL);

 	} else

 		(void)close(sock);

@@ -414,6 +416,49 @@ static CLIENT *nfs_get_tcpclient(const struct sockaddr *sap,

 }

 /**

+ * nfs_get_port - extract port value from a socket address

+ * @sap: pointer to socket address

+ *

+ * Returns port value in host byte order.

+ */

+uint16_t

+nfs_get_port(const struct sockaddr *sap)

+{

+       const struct sockaddr_in *sin = (const struct sockaddr_in *)sap;

+       const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sap;

+

+       switch (sap->sa_family) {

+       case AF_INET:

+               return ntohs(sin->sin_port);

+       case AF_INET6:

+               return ntohs(sin6->sin6_port);

+       }

+       return 0;

+}

+

+/**

+ * nfs_set_port - set port value in a socket address

+ * @sap: pointer to socket address

+ * @port: port value to set

+ *

+ */

+void

+nfs_set_port(struct sockaddr *sap, const uint16_t port)

+{

+       struct sockaddr_in *sin = (struct sockaddr_in *)sap;

+       struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;