[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  56319cf s3:rpc_transport_tstream: only use tstream_cli_np_use_trans() for sync requests
      from  dfa8a5f s3: Make srv_enc_ctx static

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 56319cf1b7935d0716a27688361ac19f4e4f74b6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jul 28 14:15:15 2011 +0200

    s3:rpc_transport_tstream: only use tstream_cli_np_use_trans() for sync requests
    
    Currently the caller doesn't cope with multiple async requests anyway,
    so this is just protection for the future.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Aug  5 22:31:12 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_client/rpc_transport_tstream.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c
index 8a860f9..e223614 100644
--- a/source3/rpc_client/rpc_transport_tstream.c
+++ b/source3/rpc_client/rpc_transport_tstream.c
@@ -380,6 +380,12 @@ static struct tevent_req *rpc_tstream_trans_send(TALLOC_CTX *mem_ctx,
 	if (tstream_is_cli_np(transp->stream)) {
 		use_trans = true;
 	}
+	if (tevent_queue_length(transp->write_queue) > 0) {
+		use_trans = false;
+	}
+	if (tevent_queue_length(transp->read_queue) > 0) {
+		use_trans = false;
+	}
 
 	if (use_trans) {
 		tstream_cli_np_use_trans(transp->stream);


-- 
Samba Shared Repository