Update.

	* sunrpc/clnt_tcp.c (clnt_call): Don't use timeout in tests with zero,
	use ct->ct_wait.
	* sunrpc/clnt_unix.c (clnt_call): Likewise.

ChangeLog

@@ -23,6 +23,9 @@
 	clnt_control for any protocol.  This would make it impossible for
 	the user to provide one in clnt_call().
 	Reported by Hitoshi Guutara Maruyama <maruyama@sh.rim.or.jp>.
+	* sunrpc/clnt_tcp.c (clnt_call): Don't use timeout in tests with zero,
+	use ct->ct_wait.
+	* sunrpc/clnt_unix.c (clnt_call): Likewise.
 
 2000-10-31  Jes Sorensen  <jes@linuxcare.com>
 

sunrpc/clnt_tcp.c

@@ -253,8 +253,8 @@ clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
     }
 
   shipnow =
-    (xdr_results == (xdrproc_t) 0 && timeout.tv_sec == 0
-     && timeout.tv_usec == 0) ? FALSE : TRUE;
+    (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0
+     && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE;
 
 call_again:
   xdrs->x_op = XDR_ENCODE;
@@ -277,7 +277,7 @@ clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
   /*
    * Hack to provide rpc-based message passing
    */
-  if (timeout.tv_sec == 0 && timeout.tv_usec == 0)
+  if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0)
     {
       return ct->ct_error.re_status = RPC_TIMEDOUT;
     }

sunrpc/clnt_unix.c

@@ -232,8 +232,8 @@ clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
     }
 
   shipnow =
-    (xdr_results == (xdrproc_t) 0 && timeout.tv_sec == 0
-     && timeout.tv_usec == 0) ? FALSE : TRUE;
+    (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0
+     && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE;
 
 call_again:
   xdrs->x_op = XDR_ENCODE;
@@ -256,7 +256,7 @@ clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
   /*
    * Hack to provide rpc-based message passing
    */
-  if (timeout.tv_sec == 0 && timeout.tv_usec == 0)
+  if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0)
     return ct->ct_error.re_status = RPC_TIMEDOUT;