libcli/security: don't look at the inherited type in get_ace_object_type()
authorStefan Metzmacher <metze@samba.org>
Fri, 4 Jan 2013 15:03:42 +0000 (16:03 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 28 Jan 2013 08:22:35 +0000 (09:22 +0100)
The inherited_type is only used to decide if aces should be inherited
effectively or not (INHERIT_ONLY) for the specified object.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Matthieu Patou <mat@matws.net>
(cherry picked from commit 629ce2a1ba392f2e8b632752c583843777471378)

libcli/security/access_check.c

index 9153dad49960a57294265c7c36a95e02ac05757c..70345f5a56089ab5b9c72858476e602e183a865d 100644 (file)
@@ -371,8 +371,6 @@ static const struct GUID *get_ace_object_type(struct security_ace *ace)
 
         if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT)
                 type = &ace->object.object.type.type;
-        else if (ace->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT)
-                type = &ace->object.object.inherited_type.inherited_type; /* This doesn't look right. Is something wrong with the IDL? */
         else
                 type = NULL;