From: Douglas Bagnall Date: Tue, 22 Aug 2023 23:25:41 +0000 (+1200) Subject: libcli/security: use sec_object_ace() in size_security_ace X-Git-Tag: tevent-0.16.0~460 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afec8524bcd39ca3a2a8465fd9d95522c902243c;p=thirdparty%2Fsamba.git libcli/security: use sec_object_ace() in size_security_ace Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/librpc/ndr/ndr_sec_helper.c b/librpc/ndr/ndr_sec_helper.c index 962881f6c4f..ffb6244eb36 100644 --- a/librpc/ndr/ndr_sec_helper.c +++ b/librpc/ndr/ndr_sec_helper.c @@ -39,12 +39,7 @@ static size_t ndr_size_security_ace_core(const struct security_ace *ace, int fla if (!ace) return 0; 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: + if (sec_ace_object(ace->type)) { 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 */ @@ -52,9 +47,6 @@ static size_t ndr_size_security_ace_core(const struct security_ace *ace, int fla if (ace->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) { ret += 16; /* GUID ace->object.object.inherited_type.inherited_type */ } - break; - default: - break; } return ret;