summaryrefslogtreecommitdiffstats
path: root/source4/libcli/security
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-12-29 06:53:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:07:41 -0500
commit66b8ff22e0a37e217333799a3b42e06c594d3976 (patch)
tree893bcdaa264bb219edb5228f882e55a8524f19ab /source4/libcli/security
parent92152aa00627ca95923cc85e3f99c0f305c569cd (diff)
downloadsamba-66b8ff22e0a37e217333799a3b42e06c594d3976.tar.gz
samba-66b8ff22e0a37e217333799a3b42e06c594d3976.tar.xz
samba-66b8ff22e0a37e217333799a3b42e06c594d3976.zip
r4388: - allow ACE flags to be specified in security_descriptor_create()
- added a test for all combinations of the inheritance ACE flags and how they are propogated to child directories and files (This used to be commit fdb38c8e4b6279137892402b21d2d52e1921e456)
Diffstat (limited to 'source4/libcli/security')
-rw-r--r--source4/libcli/security/security_descriptor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c
index 1c63478ab2..ab81a2e5b9 100644
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -223,6 +223,7 @@ BOOL security_descriptor_mask_equal(const struct security_descriptor *sd1,
SID_AUTHENTICATED_USERS,
SEC_ACE_TYPE_ACCESS_ALLOWED,
SEC_FILE_ALL,
+ SEC_ACE_FLAG_OBJECT_INHERIT,
NULL);
that would create a sd with one ACE
*/
@@ -266,7 +267,7 @@ struct security_descriptor *security_descriptor_create(TALLOC_CTX *mem_ctx,
}
ace->type = va_arg(ap, unsigned int);
ace->access_mask = va_arg(ap, unsigned int);
- ace->flags = 0;
+ ace->flags = va_arg(ap, unsigned int);
sid = dom_sid_parse_talloc(ace, sidstr);
if (sid == NULL) {
va_end(ap);