The branch, v3-6-test has been updated
via 54b81eb s3:rpc_client: we need to pass a non-blocking socket to
tstream_bsd_existing_socket()
from 5b4e40c Remember to free the second temporary string. (cherry
picked from commit c23e7292bc6406588182f87b61186087ba472ac3)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 54b81eb784d7cfb84cb749c5e9a31f515fc476c7
Author: Stefan Metzmacher <[email protected]>
Date: Wed Feb 23 21:42:25 2011 +0100
s3:rpc_client: we need to pass a non-blocking socket to
tstream_bsd_existing_socket()
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Thu Feb 24 07:43:59 CET 2011 on sn-devel-104
(cherry picked from commit 1f13d512d45eaa99023bc41cf6ec03db8cb4508e)
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_client/rpc_transport_sock.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_client/rpc_transport_sock.c
b/source3/rpc_client/rpc_transport_sock.c
index fa5c71d..58f194f 100644
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -31,6 +31,8 @@ NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
int ret;
NTSTATUS status;
+ set_blocking(fd, false);
+
ret = tstream_bsd_existing_socket(mem_ctx, fd, &stream);
if (ret != 0) {
status = map_nt_error_from_unix(errno);
--
Samba Shared Repository
