X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fnetwork.c;h=9f803a43e6c7e29561b0b62f07b47456765e8ffc;hb=bd8cc33c7c089d5d36151732f4c00a836e7732e6;hp=132ff1e763fc4980e6498427f29bc6f5a26cedfb;hpb=ac3611f10500d2942d0295c65b3d7b47621609d4;p=nfs-utils.git

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 132ff1e..9f803a4 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -303,39 +303,35 @@ static unsigned short getport(struct sockaddr_in *saddr,
 				unsigned long version,
 				unsigned int proto)
 {
+	struct sockaddr_in bind_saddr;
 	unsigned short port = 0;
 	int socket;
 	CLIENT *clnt = NULL;
 	enum clnt_stat stat;
+ 
+	bind_saddr = *saddr;
+	bind_saddr.sin_port = htons(PMAPPORT);
 
-	saddr->sin_port = htons(PMAPPORT);
-
-	/*
-	 * Try to get a socket with a non-privileged port.
-	 * clnt*create() will create one anyway if this
-	 * fails.
-	 */
-	socket = get_socket(saddr, proto, PMAP_TIMEOUT, FALSE, FALSE);
+	socket = get_socket(&bind_saddr, proto, PMAP_TIMEOUT, FALSE, FALSE);
 	if (socket == RPC_ANYSOCK) {
-		if (proto == IPPROTO_TCP && errno == ETIMEDOUT) {
-			/*
-			 * TCP SYN timed out, so exit now.
-			 */
+		if (proto == IPPROTO_TCP &&
+		    rpc_createerr.cf_error.re_errno == ETIMEDOUT)
 			rpc_createerr.cf_stat = RPC_TIMEDOUT;
-		}
 		return 0;
 	}
 
 	switch (proto) {
 	case IPPROTO_UDP:
-		clnt = clntudp_bufcreate(saddr,
+		clnt = clntudp_bufcreate(&bind_saddr,
 					 PMAPPROG, PMAPVERS,
 					 RETRY_TIMEOUT, &socket,
 					 RPCSMALLMSGSIZE,
 					 RPCSMALLMSGSIZE);
 		break;
 	case IPPROTO_TCP:
-		clnt = clnttcp_create(saddr, PMAPPROG, PMAPVERS, &socket,
+		clnt = clnttcp_create(&bind_saddr,
+				      PMAPPROG, PMAPVERS,
+				      &socket,
 				      RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
 		break;
 	}
@@ -396,7 +392,7 @@ static int probe_port(clnt_addr_t *server, const unsigned long *versions,
 						inet_ntoa(saddr->sin_addr),
 						prog, *p_vers,
 						*p_prot == IPPROTO_UDP ?
-							"udp" : "tcp",
+							_("UDP") : _("TCP"),
 						p_port);
                                 }
 				if (clnt_ping(saddr, prog, *p_vers, *p_prot, NULL))
@@ -660,10 +656,10 @@ int clnt_ping(struct sockaddr_in *saddr, const unsigned long prog,
 	static char clnt_res;
 	struct sockaddr dissolve;
 
-	rpc_createerr.cf_stat = stat = errno = 0;
+	rpc_createerr.cf_stat = stat = 0;
 	sock = get_socket(saddr, prot, CONNECT_TIMEOUT, FALSE, TRUE);
 	if (sock == RPC_ANYSOCK) {
-		if (errno == ETIMEDOUT) {
+		if (rpc_createerr.cf_error.re_errno == ETIMEDOUT) {
 			/*
 			 * TCP timeout. Bubble up the error to see 
 			 * how it should be handled.