The branch, v3-5-test has been updated via d7d39c7 s3-cli_pipe: fix timeout in rpc_pipe_open_tcp_port(). from 7942bf5 s3-docs: document all wbinfo options.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit d7d39c723e1855a3d18813e8a79fcca9770b0142 Author: Günther Deschner <g...@samba.org> Date: Wed Apr 13 17:41:36 2011 +0200 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 <vlen...@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. ----------------------------------------------------------------------- Summary of changes: source3/rpc_client/cli_pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 06b9c5d..0298f79 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -3330,7 +3330,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; } -- Samba Shared Repository