X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Frpcmisc.c;h=4bb4ec8ce2963b12f4d1e1d6f62cf87fd7539b49;hp=527070b352a82c655b324f9081ed441211ddd2cd;hb=df07daea1421c80ecf308a6daf3ab3fa7d4cfd65;hpb=1fab8a997ef035915bbac8e45884c04206e9ede9

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 527070b..4bb4ec8 100644
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -50,9 +50,9 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport,
 
 	asize = sizeof(saddr);
 	sock = 0;
-	_rpcfdtype = 0;
 	if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0) {
 		int ssize = sizeof (int);
+		_rpcfdtype = 0;
 		if (saddr.sin_family != AF_INET)
 			xlog(L_FATAL, "init: stdin is bound to non-inet addr");
 		if (getsockopt(0, SOL_SOCKET, SO_TYPE,
@@ -68,7 +68,8 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport,
 		static SVCXPRT *last_transp = NULL;
  
 		if (_rpcfdtype == 0) {
-			if (last_transp && last_transp->xp_port == defport) {
+			if (last_transp
+			    && (!defport || defport == last_transp->xp_port)) {
 				transp = last_transp;
 				goto udp_transport;
 			}
@@ -93,7 +94,8 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport,
 		static SVCXPRT *last_transp = NULL;
 
 		if (_rpcfdtype == 0) {
-			if (last_transp && last_transp->xp_port == defport) {
+			if (last_transp
+			    && (!defport || defport == last_transp->xp_port)) {
 				transp = last_transp;
 				goto tcp_transport;
 			}