Attachment 7094 Details for Bug 8357 – Regression fix from metze for 3.6.2.

[patch] Regression fix from metze for 3.6.2.

0001-s3-smb2_server-grant-credits-in-async-interim-respon.patch (text/plain), 1.56 KB, created by Jeremy Allison on 2011-11-11 22:50:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-11-11 22:50:17 UTC

Size: 1.56 KB

patch

obsolete

>From 3ae58128507b0c332637476c7ff680276a9151d2 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 8 Nov 2011 17:50:43 +0100
>Subject: [PATCH] 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)
>---
> source3/smbd/smb2_server.c |    4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
>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);
>-- 
>1.7.3.1
>

Flags:

metze: review+

Actions: View

Attachments on bug 8357: 6758 | 7094