Changeset 745 for trunk/server/libcli/security/display_sec.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• libcli/security/display_sec.c (modified) (3 diffs)

trunk/server/libcli/security/display_sec.c

@@ -20 +20 @@
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/secace.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "librpc/ndr/libndr.h"
+#include "libcli/security/display_sec.h"
 
 /****************************************************************************
@@ -160 +159 @@
 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);
         }
 }
@@ -231 +235 @@
 void display_sec_acl(struct security_acl *sec_acl)
 {
-        int i;
-
-        printf("\tACL\tNum ACEs:\t%d\trevision:\t%x\n",
+        uint32_t i;
+
+        printf("\tACL\tNum ACEs:\t%u\trevision:\t%x\n",
                          sec_acl->num_aces, sec_acl->revision); 
         printf("\t---\n");