From da75aa8271b8f5ccdfed0ecc366e916006ae6c9d Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Wed, 2 Apr 2025 12:43:15 +0200 Subject: [PATCH] smbd: check can_lock in strict_lock_check_default() BUG: https://bugzilla.samba.org/show_bug.cgi?id=15767 Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Ralph Boehme Signed-off-by: Stefan Metzmacher (cherry picked from commit 678f28c1af7c160ffdcb0e4baa0a7d4b9906f2e5) --- source3/locking/locking.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 77311151b54..12e4b1c15f8 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -118,7 +118,10 @@ bool strict_lock_check_default(files_struct *fsp, struct lock_struct *plock) return True; } - if (!lp_locking(fsp->conn->params) || !strict_locking) { + if (!lp_locking(fsp->conn->params) || + !strict_locking || + !fsp->fsp_flags.can_lock) + { return True; } -- 2.47.2