From: Michael Adam <obnox@samba.org>
Date: Wed, 1 Jul 2015 15:41:38 +0000 (+0200)
Subject: smbd:smb2: use encryption_desired in send_break
X-Git-Tag: samba-4.1.20~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aae0423902f5f159cb3fe7523fc8cd950635c832;p=thirdparty%2Fsamba.git

smbd:smb2: use encryption_desired in send_break

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11372

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
(cherry picked from commit 14357700fd69291995ce6adebb13e7340a63c209)
---

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 70ffc3cfe3a..ce393354623 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -2685,12 +2685,12 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn,
 	size_t body_len;
 	uint8_t *dyn;
 	size_t dyn_len;
-	bool do_encryption = session->global->encryption_required;
+	bool do_encryption = session->encryption_desired;
 	uint64_t nonce_high = 0;
 	uint64_t nonce_low = 0;
 	NTSTATUS status;
 
-	if (tcon->global->encryption_required) {
+	if (tcon->encryption_desired) {
 		do_encryption = true;
 	}