From 265e9d58714a7c75f2378f289a730038914351a2 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Mon, 30 Nov 2020 12:28:00 +0100 Subject: [PATCH 1/2] vfs_zfsacl: reformatting No change in behaviour. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14587 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit a8457ac3c80e22588e33a343c2306b702734ca88) --- source3/modules/vfs_zfsacl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index 093eb5111e1..fafbb30ed6f 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -219,8 +219,9 @@ static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp, } if (must_add_empty_ace) { acebuf[i].a_type = SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE; - acebuf[i].a_flags = SMB_ACE4_DIRECTORY_INHERIT_ACE| \ - SMB_ACE4_FILE_INHERIT_ACE|ACE_EVERYONE; + acebuf[i].a_flags = SMB_ACE4_DIRECTORY_INHERIT_ACE | + SMB_ACE4_FILE_INHERIT_ACE | + ACE_EVERYONE; acebuf[i].a_access_mask = 0; i++; } -- 2.26.2 From 80f02be8662c3aae7147ecb219a0b2cb23b80f40 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Mon, 30 Nov 2020 12:28:58 +0100 Subject: [PATCH 2/2] vfs_zfsacl: add missing inherited flag on hidden "magic" everyone@ ACE This was an omission in the fixes for bug 14470. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14587 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Dec 1 20:29:34 UTC 2020 on sn-devel-184 (cherry picked from commit 936f74daed0d6221312f651f35c4ed357bbf1414) --- source3/modules/vfs_zfsacl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index fafbb30ed6f..fba7253bbef 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -221,7 +221,8 @@ static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp, acebuf[i].a_type = SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE; acebuf[i].a_flags = SMB_ACE4_DIRECTORY_INHERIT_ACE | SMB_ACE4_FILE_INHERIT_ACE | - ACE_EVERYONE; + ACE_EVERYONE | + ACE_INHERITED_ACE; acebuf[i].a_access_mask = 0; i++; } -- 2.26.2