From 276a1a7fec1432bde870448f247ef710554c3ab8 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Mon, 21 Jun 2010 12:33:57 +0200 Subject: s3/s4 - remove "talloc_tos()" from common code since s4 doesn't support it Please don't use this in common code parts until we change the policy regarding it. --- libcli/security/display_sec.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'libcli/security') diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c index bec657da86..6a820673b6 100644 --- a/libcli/security/display_sec.c +++ b/libcli/security/display_sec.c @@ -159,15 +159,20 @@ void display_sec_ace_flags(uint8_t flags) ****************************************************************************/ static void disp_sec_ace_object(struct security_ace_object *object) { + char *str; if (object->flags & SEC_ACE_OBJECT_TYPE_PRESENT) { + str = GUID_string(NULL, &object->type.type); + if (str == NULL) return; printf("Object type: SEC_ACE_OBJECT_TYPE_PRESENT\n"); - printf("Object GUID: %s\n", GUID_string(talloc_tos(), - &object->type.type)); + printf("Object GUID: %s\n", str); + talloc_free(str); } if (object->flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) { + str = GUID_string(NULL, &object->inherited_type.inherited_type); + if (str == NULL) return; printf("Object type: SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT\n"); - printf("Object GUID: %s\n", GUID_string(talloc_tos(), - &object->inherited_type.inherited_type)); + printf("Object GUID: %s\n", str); + talloc_free(str); } } -- cgit