diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-13 17:41:36 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-04-18 15:01:47 +0200 |
| commit | 69da1d2d5e80ba5a8f1ef4e76890b5d3e7176a07 (patch) | |
| tree | 652664c4f8c6f81dbc358ae1f205186f45bf3105 | |
| parent | 4bcf42d4048d739b5309e3f3d4331dd66632e049 (diff) | |
| download | samba-69da1d2d5e80ba5a8f1ef4e76890b5d3e7176a07.tar.gz samba-69da1d2d5e80ba5a8f1ef4e76890b5d3e7176a07.tar.xz samba-69da1d2d5e80ba5a8f1ef4e76890b5d3e7176a07.zip | |
s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port().
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)
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 22794bc0da8..b47bef8d476 100644 --- 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; } |