[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Nov 9 03:57:02 MST 2011
The branch, master has been updated
via ffbd1ed s3:smb2_server: grant credits in async interim responses (bug #8357)
from 4b31c42 s3:libsmb: consistently use state->size in cli_write_andx_create() (bug #5326)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ffbd1ed2797616226a7987efd4b4dd4275c8c9d0
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
-----------------------------------------------------------------------
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 5977e98..33e95ad 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -955,7 +955,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);
@@ -978,6 +978,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
More information about the samba-cvs
mailing list