]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_zfsacl: add missing inherited flag on hidden "magic" everyone@ ACE
authorRalph Boehme <slow@samba.org>
Mon, 30 Nov 2020 11:28:58 +0000 (12:28 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 9 Dec 2020 11:45:09 +0000 (11:45 +0000)
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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Dec  1 20:29:34 UTC 2020 on sn-devel-184

(cherry picked from commit 936f74daed0d6221312f651f35c4ed357bbf1414)

Autobuild-User(v4-12-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-12-test): Wed Dec  9 11:45:09 UTC 2020 on sn-devel-184

source3/modules/vfs_zfsacl.c

index f09ce63411a416154dd00efc70b8a38093bb0ad9..ba8ef9504e20827783a33eab3bb3e6edc7711bd6 100644 (file)
@@ -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++;
        }