[SCM] Samba Shared Repository branch, v3-2-test, updated. initial-v3-2-unstable-9-g52ca48f

[Guenther Deschner]

The branch, v3-2-test has been updated
       via  52ca48f1881fc7b6ac9d1252468bb20eee174407 (commit)
       via  83fe2b4261f0357a62ea93b806a14225173f4945 (commit)
       via  5fa3fc81b765f1d9682170de13d2e10994fdd889 (commit)
      from  e00ea359d66347a7c6f5d75de1670f788bfdc310 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52ca48f1881fc7b6ac9d1252468bb20eee174407
Merge: 83fe2b4261f0357a62ea93b806a14225173f4945 e00ea359d66347a7c6f5d75de1670f788bfdc310
Author: Guenther Deschner <gd at samba.org>
Date:   Thu Oct 11 02:43:29 2007 +0200

    Merge commit 'origin/v3-2-test' into my_branch

commit 83fe2b4261f0357a62ea93b806a14225173f4945
Merge: 5fa3fc81b765f1d9682170de13d2e10994fdd889 be916777da8c681c393b817105e3dfe8a9c4ef12
Author: Guenther Deschner <gd at samba.org>
Date:   Thu Oct 11 02:33:07 2007 +0200

    Merge commit 'origin/v3-2-test' into my_branch

commit 5fa3fc81b765f1d9682170de13d2e10994fdd889
Author: Guenther Deschner <gd at samba.org>
Date:   Thu Oct 11 02:25:44 2007 +0200

    Display ace_objects in security descriptors.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/lib/display_sec.c |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/display_sec.c b/source/lib/display_sec.c
index cb8f151..487ac8f 100644
--- a/source/lib/display_sec.c
+++ b/source/lib/display_sec.c
@@ -66,6 +66,23 @@ void display_sec_access(SEC_ACCESS *info)
 }
 
 /****************************************************************************
+ display sec_ace object
+ ****************************************************************************/
+static void 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 sec_ace structure
  ****************************************************************************/
 void display_sec_ace(SEC_ACE *ace)
@@ -86,14 +103,35 @@ void display_sec_ace(SEC_ACE *ace)
 		case SEC_ACE_TYPE_SYSTEM_ALARM:
 			printf("SYSTEM ALARM");
 			break;
+		case SEC_ACE_TYPE_ALLOWED_COMPOUND:
+			printf("SEC_ACE_TYPE_ALLOWED_COMPOUND");
+			break;
+		case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+			printf("SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT");
+			break;
+		case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+			printf("SEC_ACE_TYPE_ACCESS_DENIED_OBJECT");
+			break;
+		case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+			printf("SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT");
+			break;
+		case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+			printf("SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT");
+			break;
 		default:
 			printf("????");
 			break;
 	}
+
 	printf(" (%d) flags: %d\n", ace->type, ace->flags);
 	display_sec_access(&ace->access_mask);
 	sid_to_string(sid_str, &ace->trustee);
 	printf("\t\tSID: %s\n\n", sid_str);
+
+	if (sec_ace_object(ace->type)) {
+		disp_sec_ace_object(&ace->object.object);
+	}
+
 }
 
 /****************************************************************************
@@ -110,7 +148,6 @@ void display_sec_acl(SEC_ACL *sec_acl)
 	if (sec_acl->size != 0 && sec_acl->num_aces != 0)
 		for (i = 0; i < sec_acl->num_aces; i++)
 			display_sec_ace(&sec_acl->aces[i]);
-				
 }
 
 void display_acl_type(uint16 type)
@@ -187,6 +224,6 @@ void display_sec_desc(SEC_DESC *sec)
 
 	if (sec->group_sid) {
 		sid_to_string(sid_str, sec->group_sid);
-		printf("\tParent SID:\t%s\n", sid_str);
+		printf("\tGroup SID:\t%s\n", sid_str);
 	}
 }


-- 
Samba Shared Repository