summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2020-11-30 12:28:58 +0100
committerKarolin Seeger <kseeger@samba.org>2020-12-09 11:45:09 +0000
commit86d4448396b9cb715e5dd9cb3d34eb0e5f0d5a76 (patch)
tree351cee06dc68c46956a39f02b9fc354cc65398fa
parenteaa736faf676fac706d841d41be4b5c9c0732a31 (diff)
downloadsamba-86d4448396b9cb715e5dd9cb3d34eb0e5f0d5a76.tar.gz
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 <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
-rw-r--r--source3/modules/vfs_zfsacl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index f09ce63411a..ba8ef9504e2 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++;
}