From 60861fba533027b6c9a0ff704b95dcf631ea3ca3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 28 Mar 2010 19:34:34 +0200 Subject: [PATCH] s3:rpc_client: return at least 10 sec as old timeout in rpccli_set_timeout() instead of 0 metze (cherry picked from commit 3e70da3f470eeb122f95477fb48d89939f501b3e) --- source3/rpc_client/cli_pipe.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 4fc36581dbf..ee60c1db044 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -3031,18 +3031,27 @@ NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli, return status; } +#define RPCCLI_DEFAULT_TIMEOUT 10000 /* 10 seconds. */ + unsigned int rpccli_set_timeout(struct rpc_pipe_client *rpc_cli, unsigned int timeout) { + unsigned int old; + if (rpc_cli->transport == NULL) { - return 0; + return RPCCLI_DEFAULT_TIMEOUT; } if (rpc_cli->transport->set_timeout == NULL) { - return 0; + return RPCCLI_DEFAULT_TIMEOUT; + } + + old = rpc_cli->transport->set_timeout(rpc_cli->transport->priv, timeout); + if (old == 0) { + return RPCCLI_DEFAULT_TIMEOUT; } - return rpc_cli->transport->set_timeout(rpc_cli->transport->priv, timeout); + return old; } bool rpccli_is_connected(struct rpc_pipe_client *rpc_cli) -- 2.34.1