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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 132ff1e..eb59c1f 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -310,19 +310,11 @@ static unsigned short getport(struct sockaddr_in *saddr,
 
 	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);
 	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;
 	}
 
@@ -396,7 +388,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 +652,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.