[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-87-g79fc0dd

[Jelmer Vernooij]

The branch, master has been updated
       via  79fc0ddaf44af1e31d7e6f2c6f576fd3c05e087d (commit)
       via  e6ec32f3acbf626f7cf52fc516f9b496d4e1d6f6 (commit)
      from  7b9381fb4f0db661a32ab884fb621cb6806ecd32 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 79fc0ddaf44af1e31d7e6f2c6f576fd3c05e087d
Merge: e6ec32f3acbf626f7cf52fc516f9b496d4e1d6f6 7b9381fb4f0db661a32ab884fb621cb6806ecd32
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 1 05:46:15 2009 +0100

    Merge branch 'master' of git://git.samba.org/samba into HEAD

commit e6ec32f3acbf626f7cf52fc516f9b496d4e1d6f6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 1 04:59:07 2009 +0100

    Eliminate two duplicate SEC_ACE_TYPE constants already provided by
    security.idl.

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

Summary of changes:
 source3/include/rpc_secdes.h  |    3 ---
 source3/lib/display_sec.c     |    8 ++++----
 source3/libads/disp_sec.c     |    8 ++++----
 source3/libgpo/gpo_sec.c      |    4 ++--
 source3/rpc_parse/parse_sec.c |    4 ++--
 5 files changed, 12 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index a1cfad9..4bf0d9c 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -39,9 +39,6 @@
 #define	SEC_RIGHTS_RESET_PASSWD		SEC_RIGHTS_EXTENDED
 #define SEC_RIGHTS_FULL_CTRL		0xf01ff
 
-#define SEC_ACE_OBJECT_PRESENT           0x00000001 /* thanks for Jim McDonough <jmcd at us.ibm.com> */
-#define SEC_ACE_OBJECT_INHERITED_PRESENT 0x00000002
-
 /*
  * New Windows 2000 bits.
  */
diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c
index 636639c..fe1ae77 100644
--- a/source3/lib/display_sec.c
+++ b/source3/lib/display_sec.c
@@ -155,13 +155,13 @@ void display_sec_ace_flags(uint8_t flags)
  ****************************************************************************/
 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");
+	if (object->flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+		printf("Object type: SEC_ACE_OBJECT_TYPE_PRESENT\n");
 		printf("Object GUID: %s\n", GUID_string(talloc_tos(),
 			&object->type.type));
 	}
-	if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) {
-		printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n");
+	if (object->flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
+		printf("Object type: SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT\n");
 		printf("Object GUID: %s\n", GUID_string(talloc_tos(), 
 			&object->inherited_type.inherited_type));
 	}
diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index a5e04a4..3bf0b6f 100644
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -112,15 +112,15 @@ static void ads_disp_sec_ace_object(ADS_STRUCT *ads,
 				    TALLOC_CTX *mem_ctx, 
 				    struct security_ace_object *object)
 {
-	if (object->flags & SEC_ACE_OBJECT_PRESENT) {
-		printf("Object type: SEC_ACE_OBJECT_PRESENT\n");
+	if (object->flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+		printf("Object type: SEC_ACE_OBJECT_TYPE_PRESENT\n");
 		printf("Object GUID: %s (%s)\n", GUID_string(mem_ctx, 
 			&object->type.type), 
 			ads_interprete_guid_from_object(ads, mem_ctx, 
 				&object->type.type));
 	}
-	if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) {
-		printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n");
+	if (object->flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
+		printf("Object type: SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT\n");
 		printf("Object GUID: %s (%s)\n", GUID_string(mem_ctx,
 			&object->inherited_type.inherited_type),
 			ads_interprete_guid_from_object(ads, mem_ctx, 
diff --git a/source3/libgpo/gpo_sec.c b/source3/libgpo/gpo_sec.c
index 42ab72a..c72bb26 100644
--- a/source3/libgpo/gpo_sec.c
+++ b/source3/libgpo/gpo_sec.c
@@ -38,12 +38,12 @@ static bool gpo_sd_check_agp_object_guid(const struct security_ace_object *objec
 	}
 
 	switch (object->flags) {
-		case SEC_ACE_OBJECT_PRESENT:
+		case SEC_ACE_OBJECT_TYPE_PRESENT:
 			if (GUID_equal(&object->type.type,
 				       &ext_right_apg_guid)) {
 				return True;
 			}
-		case SEC_ACE_OBJECT_INHERITED_PRESENT:
+		case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT:
 			if (GUID_equal(&object->inherited_type.inherited_type,
 				       &ext_right_apg_guid)) {
 				return True;
diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c
index 23c9610..91d8591 100644
--- a/source3/rpc_parse/parse_sec.c
+++ b/source3/rpc_parse/parse_sec.c
@@ -73,11 +73,11 @@ static bool sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps,
 		if (!prs_uint32("obj_flags", ps, depth, &psa->object.object.flags))
 			return False;
 
-		if (psa->object.object.flags & SEC_ACE_OBJECT_PRESENT)
+		if (psa->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT)
 			if (!smb_io_uuid("obj_guid", &psa->object.object.type.type, ps,depth))
 				return False;
 
-		if (psa->object.object.flags & SEC_ACE_OBJECT_INHERITED_PRESENT)
+		if (psa->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT)
 			if (!smb_io_uuid("inh_guid", &psa->object.object.inherited_type.inherited_type, ps,depth))
 				return False;
 


-- 
Samba Shared Repository