getport: Clear shared error fields before trying rpcbind queries

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

diff --git a/support/nfs/getport.c b/support/nfs/getport.c
index bc0f1211d6354c66279b23f5c305e8b3bec2f549..aa9c154386d4cc14c004616e9ce64e679684f561 100644 (file)
--- a/support/nfs/getport.c
+++ b/support/nfs/getport.c
@@ -469,7 +469,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);
@@ -627,6 +627,8 @@ int nfs_rpc_ping(const struct sockaddr *sap, const socklen_t salen,
        if (timeout != NULL)
                tout = *timeout;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sap, (size_t)salen);
        client = nfs_get_rpcclient(saddr, salen, protocol,
                                                program, version, &tout);
@@ -690,6 +692,8 @@ unsigned short nfs_getport(const struct sockaddr *sap,
        unsigned short port = 0;
        CLIENT *client;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sap, (size_t)salen);
        client = nfs_gp_get_rpcbclient(saddr, salen, protocol,
                                                default_rpcb_version, &timeout);
@@ -729,6 +733,8 @@ 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) {
@@ -745,6 +751,8 @@ int nfs_getport_ping(struct sockaddr *sap, const socklen_t salen,
                memcpy(saddr, sap, (size_t)salen);
                nfs_gp_set_port(saddr, htons(port));
 
+               nfs_clear_rpc_createerr();
+
                client = nfs_get_rpcclient(saddr, salen, protocol,
                                                program, version, &timeout);
                if (client != NULL) {
@@ -803,6 +811,8 @@ 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;
@@ -817,6 +827,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);
@@ -878,6 +890,8 @@ unsigned short nfs_rpcb_getaddr(const struct sockaddr *sap,
        if (timeout != NULL)
                tout = *timeout;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sap, (size_t)salen);
        client = nfs_gp_get_rpcbclient(saddr, salen, transport,
                                                        RPCBVERS_4, &tout);
@@ -904,6 +918,8 @@ unsigned short nfs_rpcb_getaddr(__attribute__((unused)) const struct sockaddr *s
                                __attribute__((unused)) const unsigned short protocol,
                                __attribute__((unused)) const struct timeval *timeout)
 {
+       nfs_clear_rpc_createerr();
+
        rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
        return 0;
 }
@@ -959,6 +975,8 @@ unsigned long nfs_pmap_getport(const struct sockaddr_in *sin,
        if (timeout != NULL)
                tout = *timeout;
 
+       nfs_clear_rpc_createerr();
+
        memcpy(saddr, sin, sizeof(address));
        client = nfs_gp_get_rpcbclient(saddr, (socklen_t)sizeof(*sin),
                                        transport, PMAPVERS, &tout);