s3:smbd: share_mode_flags_set() takes SMB2_LEASE_* values
authorStefan Metzmacher <metze@samba.org>
Mon, 15 Aug 2022 08:49:13 +0000 (10:49 +0200)
committerJeremy Allison <jra@samba.org>
Thu, 18 Aug 2022 18:45:34 +0000 (18:45 +0000)
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>
source3/smbd/open.c
source3/smbd/smb2_oplock.c

index fa3be0a6e3b21f4ea6e69099e1e702d27e819e11..1d6c3cfbfbc084a705a42be683819f1dc4868583 100644 (file)
@@ -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);
        }
 
index 367b0fd3191adf274b994ad60a25ac4c2ec73cdf..a555d3ae4fe2e53d618e70fb786c23950338e8db 100644 (file)
@@ -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);
        }