diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-03-28 19:34:34 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-06 14:08:37 +0200 |
| commit | 48ab7d0bd7b606620111ea31aa062edc8ae26f7f (patch) | |
| tree | e9aef5c78885d28c284b0c32722349c436edba5f | |
| parent | 50f8ed9c85a3caeac466e87175e084fc00e47209 (diff) | |
| download | samba-48ab7d0bd7b606620111ea31aa062edc8ae26f7f.tar.gz | |
s3:rpc_client: return at least 10 sec as old timeout in rpccli_set_timeout() instead of 0
metze
(cherry picked from commit 3e70da3f470eeb122f95477fb48d89939f501b3e)
(cherry picked from commit 60861fba533027b6c9a0ff704b95dcf631ea3ca3)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 5ae76f3beac43e7064b0304df24be84642882372)
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 9ce090f51f1..22794bc0da8 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2950,18 +2950,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) |