From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 Aug 2022 08:49:13 +0000 (+0200)
Subject: s3:smbd: share_mode_flags_set() takes SMB2_LEASE_* values
X-Git-Tag: talloc-2.4.0~1402
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7592aad4d7a84d0ac66a156a22af3ad77803e55c;p=thirdparty%2Fsamba.git

s3:smbd: share_mode_flags_set() takes SMB2_LEASE_* values

We currently only ever pass SMB2_LEASE_READ and both
have the same value of 0x1, so for now it's only cosmetic,
but that will change soon.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index fa3be0a6e3b..1d6c3cfbfbc 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2796,7 +2796,7 @@ grant:
 	if (granted & SMB2_LEASE_READ) {
 		uint32_t acc, sh, ls;
 		share_mode_flags_get(lck, &acc, &sh, &ls);
-		ls |= SHARE_MODE_LEASE_READ;
+		ls |= SMB2_LEASE_READ;
 		share_mode_flags_set(lck, acc, sh, ls, NULL);
 	}
 
diff --git a/source3/smbd/smb2_oplock.c b/source3/smbd/smb2_oplock.c
index 367b0fd3191..a555d3ae4fe 100644
--- a/source3/smbd/smb2_oplock.c
+++ b/source3/smbd/smb2_oplock.c
@@ -1310,7 +1310,7 @@ static void contend_level2_oplocks_begin_default(files_struct *fsp,
 		 */
 		uint32_t acc, sh, ls;
 		share_mode_flags_get(lck, &acc, &sh, &ls);
-		ls &= ~SHARE_MODE_LEASE_READ;
+		ls &= ~SMB2_LEASE_READ;
 		share_mode_flags_set(lck, acc, sh, ls, NULL);
 	}