smbd: fix handling of directory leases and oplock levels

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Mar 28 07:53:25 UTC 2025 on atb-devel-224

diff --git a/selftest/knownfail.d/samba3.smb2.dirlease b/selftest/knownfail.d/samba3.smb2.dirlease
deleted file mode 100644 (file)
index 0aa9d23..0000000
--- a/selftest/knownfail.d/samba3.smb2.dirlease
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smb2.dirlease.oplocks\(fileserver\)

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a9e68bad468b19d75549b01b89dc1367c1f6ec84..25f54428bb15b905d4ce937b6a167a5ec44c3917 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -5165,6 +5165,13 @@ static NTSTATUS open_directory(connection_struct *conn,
                keep_locked = true;
        }
 
+       if ((oplock_request != NO_OPLOCK) && (oplock_request != LEASE_OPLOCK)) {
+               /*
+                * No oplocks on directories, only leases
+                */
+               oplock_request = NO_OPLOCK;
+       }
+
        lck_state = (struct open_ntcreate_lock_state) {
                .fsp                    = fsp,
                .object_type            = "directory",