Attachment 18781 Details for Bug 15926 – Followup patch for 4.22 and 4.23 cherry-picked from master

[patch] Followup patch for 4.22 and 4.23 cherry-picked from master

bug15925-followup-v422,v423.patch (text/plain), 1.12 KB, created by Ralph Böhme on 2025-11-21 10:42:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2025-11-21 10:42:24 UTC

Size: 1.12 KB

patch

obsolete

>From efc3de46e8fcb19efff7ef083e59b5c045ab4120 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Fri, 14 Nov 2025 14:55:12 +0100
>Subject: [PATCH] vfs_fruit: psd->dacl can be NULL, use orig_num_aces
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15926
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Tue Nov 18 10:13:44 UTC 2025 on atb-devel-224
>
>(cherry picked from commit 0de67cf0748139920006a4dd65cb77c874c3595f)
>---
> source3/modules/vfs_fruit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
>index 302d90ce997a..4da7c1efa07b 100644
>--- a/source3/modules/vfs_fruit.c
>+++ b/source3/modules/vfs_fruit.c
>@@ -4655,7 +4655,7 @@ static NTSTATUS fruit_fset_nt_acl(vfs_handle_struct *handle,
> 
> 	DBG_DEBUG("%s\n", fsp_str_dbg(fsp));
> 
>-	if (config->ignore_zero_aces && (psd->dacl->num_aces == 0)) {
>+	if (config->ignore_zero_aces && (orig_num_aces == 0)) {
> 		/*
> 		 * Just ignore Set-ACL requests with zero ACEs.
> 		 */
>-- 
>2.50.0
>

Flags:

vl: review+

Actions: View

Attachments on bug 15926: 18754 | 18755 | 18781