git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4bcf42d
)
s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port().
author
Günther Deschner
<gd@samba.org>
Wed, 13 Apr 2011 15:41:36 +0000
(17:41 +0200)
committer
Karolin Seeger
<kseeger@samba.org>
Mon, 18 Apr 2011 13:01:47 +0000
(15:01 +0200)
Make sure we use a timeout of 60 seconds, not 60 milliseconds...
This prevented us from successfully using the ncacn_ip_tcp client in a lot of
places, I guess.
Guenther
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Apr 13 18:59:19 CEST 2011 on sn-devel-104
(cherry picked from commit
4b3fe5247a6e16b1ad9f05269e9aa00e3120e36a
)
Fix bug #8085 - incorrect timeout handling in ncacn_ip_tcp client code.
(cherry picked from commit
d7d39c723e1855a3d18813e8a79fcca9770b0142
)
(cherry picked from commit
f7a175f47ee65c58363615541577db65d8b9fa76
)
source3/rpc_client/cli_pipe.c
patch
|
blob
|
history
diff --git
a/source3/rpc_client/cli_pipe.c
b/source3/rpc_client/cli_pipe.c
index 22794bc0da8e502080c6f3ddd7fa322a47394174..b47bef8d47689662bc056da472ddfb62cfe246f4 100644
(file)
--- a/
source3/rpc_client/cli_pipe.c
+++ b/
source3/rpc_client/cli_pipe.c
@@
-3247,7
+3247,7
@@
static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
goto fail;
}
- status = open_socket_out(&addr, port, 60, &fd);
+ status = open_socket_out(&addr, port, 60
*1000
, &fd);
if (!NT_STATUS_IS_OK(status)) {
goto fail;
}