Really(!) finish the port-sharing diff.

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

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 527070b352a82c655b324f9081ed441211ddd2cd..457d642558c2c705ac0ea97a9d0a594ed5b536d1 100644 (file)
--- 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;
                        }