Eliminate two duplicate SEC_ACE_TYPE constants already provided by

security.idl.

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index a1cfad90031c796a7c46b6611a9ba8f4414bff97..4bf0d9cb9d6d4c525a625acb44290035d0bf523b 100644 (file)
--- 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@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 636639c11d8e36c94b572b7b9e2d14bba4e9df77..fe1ae77eddfe111a1638c37cafa0cd4e66a44369 100644 (file)
--- 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 a5e04a4a6c49e3b72e62ea80bb97bc17175f8324..3bf0b6f7a7d9cff1926048510e35216fa392a15e 100644 (file)
--- 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 42ab72a99bb3d59fc865957049da8e127873f874..c72bb2673240535461dfb7023eb4da3e7f1f49cc 100644 (file)
--- 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 23c96103811eb19cd77bbd01e5856d9da53cacba..91d8591a05d3dba41e98ab28b7b78e3c71a118c2 100644 (file)
--- 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;