summaryrefslogtreecommitdiff
path: root/libcli
diff options
context:
space:
mode:
authorRichard Sharpe <realrichardsharpe@gmail.com>2013-03-27 19:36:43 -0700
committerJeremy Allison <jra@samba.org>2013-03-28 19:43:41 +0100
commit7fd926fcdcb92a8e1e2b0c29371f2eb2ae4057df (patch)
tree8cee847ff3c9e8d3b8eda475602dfb975b013cdb /libcli
parentffe14d99083fe5344fa7678e7ad780d930398427 (diff)
downloadsamba-7fd926fcdcb92a8e1e2b0c29371f2eb2ae4057df.tar.gz
samba-7fd926fcdcb92a8e1e2b0c29371f2eb2ae4057df.tar.bz2
samba-7fd926fcdcb92a8e1e2b0c29371f2eb2ae4057df.zip
Make sure that we only propogate the INHERITED flag when we are allowed to.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Mar 28 19:43:41 CET 2013 on sn-devel-104
Diffstat (limited to 'libcli')
-rw-r--r--libcli/security/secdesc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index d2c5833492..a7e99005eb 100644
--- a/libcli/security/secdesc.c
+++ b/libcli/security/secdesc.c
@@ -614,7 +614,8 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
if (!container) {
new_flags = 0;
} else {
- new_flags &= ~SEC_ACE_FLAG_INHERIT_ONLY;
+ new_flags &= ~(SEC_ACE_FLAG_INHERIT_ONLY
+ | SEC_ACE_FLAG_INHERITED_ACE);
if (!(new_flags & SEC_ACE_FLAG_CONTAINER_INHERIT)) {
new_flags |= SEC_ACE_FLAG_INHERIT_ONLY;