getport: Clear shared error fields before trying rpcbind queries

[nfs-utils.git] / support / nfs / rpc_socket.c

diff --git a/support/nfs/rpc_socket.c b/support/nfs/rpc_socket.c
index cebf83ddc71c94f9e68cba8c9c761d2ab2fdf25d..a080487e891f3144927615d27fa9fa99ba8e8cee 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_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);
@@ -441,6 +443,8 @@ CLIENT *nfs_get_rpcclient(const struct sockaddr *sap,
        struct sockaddr_in *sin = (struct sockaddr_in *)sap;
        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
 
+       nfs_clear_rpc_createerr();
+
        switch (sap->sa_family) {
        case AF_LOCAL:
                return nfs_get_localclient(sap, salen, program,
@@ -458,7 +462,7 @@ CLIENT *nfs_get_rpcclient(const struct sockaddr *sap,
                }
                break;
        default:
-               rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
+               rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
                return NULL;
        }
 
@@ -504,6 +508,8 @@ CLIENT *nfs_get_priv_rpcclient(const struct sockaddr *sap,
        struct sockaddr_in *sin = (struct sockaddr_in *)sap;
        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
 
+       nfs_clear_rpc_createerr();
+
        switch (sap->sa_family) {
        case AF_LOCAL:
                return nfs_get_localclient(sap, salen, program,
@@ -521,7 +527,7 @@ CLIENT *nfs_get_priv_rpcclient(const struct sockaddr *sap,
                }
                break;
        default:
-               rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
+               rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
                return NULL;
        }