From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 28 Mar 2010 17:34:34 +0000 (+0200)
Subject: s3:rpc_client: return at least 10 sec as old timeout in rpccli_set_timeout() instead... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ae76f3beac43e7064b0304df24be84642882372;p=thirdparty%2Fsamba.git

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>
---

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)