diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-30 23:29:14 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-30 23:29:14 +0100 |
| commit | 6acd90998803c28fa12ff0d1f47056c64b7d8d8d (patch) | |
| tree | 11d0df3327f71e02cecafd79ec98af0fd2409438 /source3/lib | |
| parent | 0ab0373a97114b2911ed5f38e3548676f196a2c0 (diff) | |
| parent | 782f309df35cba41c9e5b65db242b961bacbbf87 (diff) | |
| download | samba-6acd90998803c28fa12ff0d1f47056c64b7d8d8d.tar.gz samba-6acd90998803c28fa12ff0d1f47056c64b7d8d8d.tar.bz2 samba-6acd90998803c28fa12ff0d1f47056c64b7d8d8d.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/secdesc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index 6afc165c0f..1da2b3ec93 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -527,9 +527,9 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, if (creator && container && (new_flags & SEC_ACE_FLAG_CONTAINER_INHERIT)) { - /* First add the regular ACE entry with flags = 0. */ + /* First add the regular ACE entry. */ init_sec_ace(new_ace, ptrustee, ace->type, - ace->access_mask, 0); + ace->access_mask, SEC_ACE_FLAG_INHERITED_ACE); DEBUG(5,("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x" " inherited as %s:%d/0x%02x/0x%08x\n", @@ -549,7 +549,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, } init_sec_ace(new_ace, ptrustee, ace->type, - ace->access_mask, new_flags); + ace->access_mask, new_flags | SEC_ACE_FLAG_INHERITED_ACE); DEBUG(5, ("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x " " inherited as %s:%d/0x%02x/0x%08x\n", |