diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 04:02:47 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 04:02:47 +0100 |
commit | 31fa08dcbdc643ec738474c0be471e77925f76fc (patch) | |
tree | c4337b4bd77a31f4f593d8c94bbd15b796123117 /source3/lib/secdesc.c | |
parent | 5a56c0adf2c63602b819d052644cb14caf732438 (diff) | |
parent | 7b186c48d365ae8eda81ae9a0af100d2214bee32 (diff) | |
download | samba-31fa08dcbdc643ec738474c0be471e77925f76fc.tar.gz samba-31fa08dcbdc643ec738474c0be471e77925f76fc.tar.bz2 samba-31fa08dcbdc643ec738474c0be471e77925f76fc.zip |
Merge branch 'master' of /home/jelmer/samba3
Conflicts:
lib/replace/README
lib/replace/libreplace.m4
lib/replace/replace.c
source3/include/proto.h
source3/lib/system.c
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); |