diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-15 09:54:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:43:30 -0500 |
| commit | beb955758bfd56aaf51de1342bdc269ba2ee65c0 (patch) | |
| tree | 6bb204ae21e731419b2b5560f50f3b20a4841412 /source4/librpc/ndr | |
| parent | 0bb7e6847ea19103a48da11dd5139985c3cb17d7 (diff) | |
| download | samba-beb955758bfd56aaf51de1342bdc269ba2ee65c0.tar.gz samba-beb955758bfd56aaf51de1342bdc269ba2ee65c0.tar.bz2 samba-beb955758bfd56aaf51de1342bdc269ba2ee65c0.zip | |
r20798: fix ndr_size_security_ace() it should include the optional sub object
for ADS style ace's
metze
(This used to be commit 161fea1a141de085eb6c84efc5b120e00cf95943)
Diffstat (limited to 'source4/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/ndr_sec_helper.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/source4/librpc/ndr/ndr_sec_helper.c b/source4/librpc/ndr/ndr_sec_helper.c index 8059c0f4ea..0a2f3b37f5 100644 --- a/source4/librpc/ndr/ndr_sec_helper.c +++ b/source4/librpc/ndr/ndr_sec_helper.c @@ -54,10 +54,29 @@ size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags) */ size_t ndr_size_security_ace(const struct security_ace *ace, int flags) { + size_t ret; + if (!ace) return 0; - return 8 + ndr_size_dom_sid(&ace->trustee, flags); -} + ret = 8 + ndr_size_dom_sid(&ace->trustee, flags); + + switch (ace->type) { + case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT: + case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT: + case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT: + case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT: + ret += 4; /* uint32 bitmap ace->object.object.flags */ + if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT) { + ret += 16; /* GUID ace->object.object.type.type */ + } + if (ace->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) { + ret += 16; /* GUID ace->object.object.inherited_typeinherited_type */ + } + break; + } + + return ret; +} /* return the wire size of a security_acl |