From: David Mulder <dmulder@suse.com>
Date: Tue, 15 Mar 2022 20:38:03 +0000 (-0600)
Subject: smbd: Disable smb1 oplock calls when smb1 is disabled
X-Git-Tag: tevent-0.12.0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e0b0402f8ab54efb17faeb0fc3afae15cf4f979;p=thirdparty%2Fsamba.git

smbd: Disable smb1 oplock calls when smb1 is disabled

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index fe4d4831bfc..367b0fd3191 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1024,12 +1024,16 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
 		wait_before_sending_break();
 	}
 
+#if defined(WITH_SMB1SERVER)
 	if (sconn->using_smb2) {
+#endif
 		send_break_message_smb2(fsp, break_from, break_to);
+#if defined(WITH_SMB1SERVER)
 	} else {
 		send_break_message_smb1(fsp, (break_to & SMB2_LEASE_READ) ?
 					OPLOCKLEVEL_II : OPLOCKLEVEL_NONE);
 	}
+#endif
 
 	if ((break_from == SMB2_LEASE_READ) &&
 	    (break_to == SMB2_LEASE_NONE)) {
@@ -1106,11 +1110,15 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
 		return;
 	}
 
+#if defined(WITH_SMB1SERVER)
 	if (sconn->using_smb2) {
+#endif
 		send_break_message_smb2(fsp, 0, OPLOCKLEVEL_NONE);
+#if defined(WITH_SMB1SERVER)
 	} else {
 		send_break_message_smb1(fsp, OPLOCKLEVEL_NONE);
 	}
+#endif
 
 	fsp->sent_oplock_break = BREAK_TO_NONE_SENT;