From 80159018e411c643fbfe7ef82bd33e30b6147901 Mon Sep 17 00:00:00 2001 From: Anna Popova Date: Fri, 12 Apr 2024 17:32:37 +0300 Subject: [PATCH] s3:utils: Fix Inherit-Only flag being automatically propagated to children MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Inherit-only flag applies only to the container it was set to and it shouldn't be automatically propagated to children. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15636 Signed-off-by: Anna Popova Reviewed-by: Noel Power Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Mon Apr 29 10:56:48 UTC 2024 on atb-devel-224 --- selftest/knownfail.d/smbcacls | 6 ------ source3/utils/smbcacls.c | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 selftest/knownfail.d/smbcacls diff --git a/selftest/knownfail.d/smbcacls b/selftest/knownfail.d/smbcacls deleted file mode 100644 index 5e201dfc9b7..00000000000 --- a/selftest/knownfail.d/smbcacls +++ /dev/null @@ -1,6 +0,0 @@ -^samba.tests.blackbox.smbcacls_propagate_inhertance.samba.tests.blackbox.smbcacls_propagate_inhertance.InheritanceSmbCaclsTests.test_simple_iocioi_add -^samba.tests.blackbox.smbcacls_propagate_inhertance.samba.tests.blackbox.smbcacls_propagate_inhertance.InheritanceSmbCaclsTests.test_simple_ioci_add -^samba.tests.blackbox.smbcacls_dfs_propagate_inherit\(DFS-msdfs-root\).samba.tests.blackbox.smbcacls_propagate_inhertance.InheritanceSmbCaclsTests.test_simple_iocioi_add -^samba.tests.blackbox.smbcacls_dfs_propagate_inherit\(DFS-msdfs-root\).samba.tests.blackbox.smbcacls_propagate_inhertance.InheritanceSmbCaclsTests.test_simple_ioci_add -^samba.tests.blackbox.smbcacls_dfs_propagate_inherit\(DFS-msdfs-root\).samba.tests.blackbox.smbcacls_dfs_propagate_inherit.DfsInheritanceSmbCaclsTests.test_simple_iocioi_add -^samba.tests.blackbox.smbcacls_dfs_propagate_inherit\(DFS-msdfs-root\).samba.tests.blackbox.smbcacls_dfs_propagate_inherit.DfsInheritanceSmbCaclsTests.test_simple_ioci_add \ No newline at end of file diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 2f688290a47..45f98d36075 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -921,6 +921,10 @@ static uint8_t get_flags_to_propagate(bool is_container, /* Assume we are not propagating the ACE */ newflags &= ~SEC_ACE_FLAG_INHERITED_ACE; + + /* Inherit-only flag is not propagated to children */ + + newflags &= ~SEC_ACE_FLAG_INHERIT_ONLY; /* all children need to have the SEC_ACE_FLAG_INHERITED_ACE set */ if (acl_cntrinherit || acl_objinherit) { /* -- 2.34.1