summaryrefslogtreecommitdiffstats
path: root/source3/utils
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 13:04:45 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 13:04:45 +0000
commit2bd081638d74726f88f8b243bfe324adff652432 (patch)
treed42bc3e63190a38909555bcd3f20dc72172eb59f /source3/utils
parentReleasing progress-linux version 2:4.20.0+dfsg-1~exp2~progress7.99u1. (diff)
downloadsamba-2bd081638d74726f88f8b243bfe324adff652432.tar.xz
samba-2bd081638d74726f88f8b243bfe324adff652432.zip
Merging upstream version 2:4.20.1+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/smbcacls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index ff11ba4..e0591ac 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -914,6 +914,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) {
/*