From: Jeremy Allison Date: Thu, 7 Nov 2019 20:02:13 +0000 (-0800) Subject: s3: smbd: SMB2 - Ensure we use the correct session_id if encrypting an interim response. X-Git-Tag: samba-4.10.13~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c9250320de81d2d6e1d0ceab3c1846c4c52248;p=thirdparty%2Fsamba.git s3: smbd: SMB2 - Ensure we use the correct session_id if encrypting an interim response. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14189 Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher (cherry picked from commit eae1a45d09ef54dd6b59803eedca672ae9433902) --- diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index cec1d9ad2a9..24d96dec534 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -1607,7 +1607,7 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev, outhdr = SMBD_SMB2_OUT_HDR_PTR(req); flags = IVAL(outhdr, SMB2_HDR_FLAGS); message_id = BVAL(outhdr, SMB2_HDR_MESSAGE_ID); - session_id = BVAL(outhdr, SMB2_HDR_SESSION_ID); + session_id = req->session->global->session_wire_id; async_id = message_id; /* keep it simple for now... */