[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  ec72b63 s3:smb2_server: grant credits in async interim responses (bug #8357)
      from  b3f98fc s3:smbd: don't limit the number of open dptrs for smb2 (bug #8592)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit ec72b6366701952e7d7574f22997b59858f887b0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 8 17:50:43 2011 +0100

    s3:smb2_server: grant credits in async interim responses (bug #8357)
    
    The first fix for bug #8357 intruduced a regression, so that we no
    longer grant credits for real async interim responses with
    STATUS_PENDING.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Nov  9 11:56:29 CET 2011 on sn-devel-104
    (cherry picked from commit ffbd1ed2797616226a7987efd4b4dd4275c8c9d0)

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

Summary of changes:
 source3/smbd/smb2_server.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 4da1e15..0e70983 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -952,7 +952,7 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
 	SIVAL(hdr, SMB2_HDR_STATUS, NT_STATUS_V(STATUS_PENDING));
 	SSVAL(hdr, SMB2_HDR_OPCODE, SVAL(reqhdr, SMB2_HDR_OPCODE));
 
-	SIVAL(hdr, SMB2_HDR_FLAGS, flags | SMB2_HDR_FLAG_ASYNC);
+	SIVAL(hdr, SMB2_HDR_FLAGS, flags);
 	SIVAL(hdr, SMB2_HDR_NEXT_COMMAND, 0);
 	SBVAL(hdr, SMB2_HDR_MESSAGE_ID, message_id);
 	SBVAL(hdr, SMB2_HDR_PID, async_id);
@@ -975,6 +975,8 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
 			&req->in.vector[i],
 			&state->vector[1]);
 
+	SIVAL(hdr, SMB2_HDR_FLAGS, flags | SMB2_HDR_FLAG_ASYNC);
+
 	if (req->do_signing) {
 		status = smb2_signing_sign_pdu(req->session->session_key,
 					&state->vector[1], 2);


-- 
Samba Shared Repository