summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-11-08 17:50:43 +0100
committerKarolin Seeger <kseeger@samba.org>2011-11-14 20:14:52 +0100
commitec72b6366701952e7d7574f22997b59858f887b0 (patch)
tree5b86da7505ea2a92faae7a56b520082f725208da
parentb3f98fc0366cd27c9e043591c70e283423fcd77e (diff)
downloadsamba-ec72b6366701952e7d7574f22997b59858f887b0.tar.gz
samba-ec72b6366701952e7d7574f22997b59858f887b0.tar.xz
samba-ec72b6366701952e7d7574f22997b59858f887b0.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 (cherry picked from commit ffbd1ed2797616226a7987efd4b4dd4275c8c9d0)
-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 4da1e15eea0..0e70983263b 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);