diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:15:59 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:15:59 +0100 |
| commit | c165770f943d157c11d44566558ae07bf901bd26 (patch) | |
| tree | faa9e7bfe5242aa7661c69b991ad7fa213806f8f /source3/lib/secdesc.c | |
| parent | 2c81fd70ca4997947275ce823f08c895000fbc3d (diff) | |
| parent | 54eaf2de74b4779919ae97b54abceb3878894bf6 (diff) | |
| download | samba-c165770f943d157c11d44566558ae07bf901bd26.tar.gz samba-c165770f943d157c11d44566558ae07bf901bd26.tar.bz2 samba-c165770f943d157c11d44566558ae07bf901bd26.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/lib/secdesc.c')
| -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 1da2b3ec93..2987306066 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -529,7 +529,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, /* First add the regular ACE entry. */ init_sec_ace(new_ace, ptrustee, ace->type, - ace->access_mask, SEC_ACE_FLAG_INHERITED_ACE); + ace->access_mask, 0); 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 | SEC_ACE_FLAG_INHERITED_ACE); + ace->access_mask, new_flags); DEBUG(5, ("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x " " inherited as %s:%d/0x%02x/0x%08x\n", @@ -565,7 +565,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, /* Create child security descriptor to return */ new_dacl = make_sec_acl(ctx, - ACL_REVISION, + NT4_ACL_REVISION, new_ace_list_ndx, new_ace_list); |