summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-11-08 17:50:43 +0100
committerStefan Metzmacher <metze@samba.org>2011-11-09 11:56:29 +0100
commitffbd1ed2797616226a7987efd4b4dd4275c8c9d0 (patch)
tree303429711d9782ca68d81998678f0842a6eb5c08 /source3
parent4b31c4273c45faa639445614061f3da548eb8505 (diff)
downloadsamba-ffbd1ed2797616226a7987efd4b4dd4275c8c9d0.tar.gz
samba-ffbd1ed2797616226a7987efd4b4dd4275c8c9d0.tar.bz2
samba-ffbd1ed2797616226a7987efd4b4dd4275c8c9d0.zip
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@samba.org> Autobuild-Date: Wed Nov 9 11:56:29 CET 2011 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/smb2_server.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 5977e982c0..33e95addbe 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);