From: chip <chip>
Date: Sun, 30 Apr 2000 04:14:56 +0000 (+0000)
Subject: Really(!) finish the port-sharing diff.
X-Git-Tag: nfs-utils-0-1-7-2~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=646251e68a34cb0d4cf85d4ec24c644227f09727

Really(!) finish the port-sharing diff.
---

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 527070b..457d642 100644
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -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;
 			}