svn commit: samba r23820 - in branches: SAMBA_3_2/source/libads SAMBA_3_2_0/source/libads

[gd at samba.org]

Author: gd
Date: 2007-07-10 21:04:57 +0000 (Tue, 10 Jul 2007)
New Revision: 23820

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23820

Log:
Display security_ace_object in LDAP security descriptors for debugging.

Guenther

Modified:
   branches/SAMBA_3_2/source/libads/disp_sec.c
   branches/SAMBA_3_2_0/source/libads/disp_sec.c


Changeset:
Modified: branches/SAMBA_3_2/source/libads/disp_sec.c
===================================================================
--- branches/SAMBA_3_2/source/libads/disp_sec.c	2007-07-10 16:41:26 UTC (rev 23819)
+++ branches/SAMBA_3_2/source/libads/disp_sec.c	2007-07-10 21:04:57 UTC (rev 23820)
@@ -82,6 +82,20 @@
 	puts("");
 }
 
+static void ads_disp_sec_ace_object(struct security_ace_object *object)
+{
+	if (object->flags & SEC_ACE_OBJECT_PRESENT) {
+		printf("Object type: SEC_ACE_OBJECT_PRESENT\n");
+		printf("Object GUID: %s\n", smb_uuid_string_static(
+			object->type.type));
+	}
+	if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) {
+		printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n");
+		printf("Object GUID: %s\n", smb_uuid_string_static(
+			object->inherited_type.inherited_type));
+	}
+}
+
 /* display ACE */
 static void ads_disp_ace(SEC_ACE *sec_ace)
 {
@@ -119,6 +133,10 @@
 	printf("access SID:  %s\naccess type: %s\n", 
                sid_string_static(&sec_ace->trustee), access_type);
 
+	if (sec_ace_object(sec_ace->type)) {
+		ads_disp_sec_ace_object(&sec_ace->object.object);
+	}
+
 	ads_disp_perms(sec_ace->access_mask);
 }
 

Modified: branches/SAMBA_3_2_0/source/libads/disp_sec.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/disp_sec.c	2007-07-10 16:41:26 UTC (rev 23819)
+++ branches/SAMBA_3_2_0/source/libads/disp_sec.c	2007-07-10 21:04:57 UTC (rev 23820)
@@ -82,6 +82,20 @@
 	puts("");
 }
 
+static void ads_disp_sec_ace_object(struct security_ace_object *object)
+{
+	if (object->flags & SEC_ACE_OBJECT_PRESENT) {
+		printf("Object type: SEC_ACE_OBJECT_PRESENT\n");
+		printf("Object GUID: %s\n", smb_uuid_string_static(
+			object->type.type));
+	}
+	if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) {
+		printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n");
+		printf("Object GUID: %s\n", smb_uuid_string_static(
+			object->inherited_type.inherited_type));
+	}
+}
+
 /* display ACE */
 static void ads_disp_ace(SEC_ACE *sec_ace)
 {
@@ -119,6 +133,10 @@
 	printf("access SID:  %s\naccess type: %s\n", 
                sid_string_static(&sec_ace->trustee), access_type);
 
+	if (sec_ace_object(sec_ace->type)) {
+		ads_disp_sec_ace_object(&sec_ace->object.object);
+	}
+
 	ads_disp_perms(sec_ace->access_mask);
 }