[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: smbd-fix-handling-of-directory-leases-and-oplock-lev.patch

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
96c6ed68 by Michael Tokarev at 2025-03-29T07:24:39+03:00
smbd-fix-handling-of-directory-leases-and-oplock-lev.patch

Closes: #1100604

- - - - -
f5c450ad by Michael Tokarev at 2025-03-29T07:24:59+03:00
update changelog; upload version 4.22.0+dfsg-2 to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/smbd-fix-handling-of-directory-leases-and-oplock-lev.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+samba (2:4.22.0+dfsg-2) unstable; urgency=medium
+
+  * smbd-fix-handling-of-directory-leases-and-oplock-lev.patch
+    (Closes: #1100604)
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Sat, 29 Mar 2025 07:24:47 +0300
+
 samba (2:4.22.0+dfsg-1) unstable; urgency=medium
 
   * new upstream release


=====================================
debian/patches/series
=====================================
@@ -23,3 +23,4 @@ meaningful-error-if-no-python3-markdown.patch
 ctdb-use-run-instead-of-var-run.patch
 revert-ldb-use-hexchars_upper-from-replace.h.patch
 replace-xpg-strerror.patch
+smbd-fix-handling-of-directory-leases-and-oplock-lev.patch


=====================================
debian/patches/smbd-fix-handling-of-directory-leases-and-oplock-lev.patch
=====================================
@@ -0,0 +1,43 @@
+From 4b3f45e13f9c11920924c034a457ea2cb8e15e18 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <slow at samba.org>
+Date: Sat, 22 Mar 2025 16:59:07 +0100
+Subject: smbd: fix handling of directory leases and oplock levels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Origin: upstream, https://bugzilla.samba.org/show_bug.cgi?id=15836
+Forwarded: yes
+Bug-Debian: https://bugs.debian.org/1100604
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15836
+
+Signed-off-by: Ralph Boehme <slow at samba.org>
+Reviewed-by: Stefan Metzmacher <metze at samba.org>
+
+Autobuild-User(master): Ralph Böhme <slow at samba.org>
+Autobuild-Date(master): Fri Mar 28 07:53:25 UTC 2025 on atb-devel-224
+---
+ source3/smbd/open.c                       | 7 +++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/source3/smbd/open.c b/source3/smbd/open.c
+index a9e68bad468..25f54428bb1 100644
+--- 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",
+-- 
+2.39.5
+



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/8b070b2fd9dac0cfc2860ab0958f154b8a949299...f5c450ad1d4102a513549b99aff57fa36405655c

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/8b070b2fd9dac0cfc2860ab0958f154b8a949299...f5c450ad1d4102a513549b99aff57fa36405655c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20250329/328ba177/attachment-0001.htm>