librpc/idl: change from samr_GroupAttrs in samr.idl to security_GroupAttrs in securit...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index 448a58bcd1f597223d563911d38ba7bbaecb0aef..2aaae8dce5956eb48fcd02e7557c4e3f6db3b80f 100644 (file)
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -13,7 +13,7 @@ import "security.idl", "misc.idl", "lsa.idl", "samr.idl";
 ]
 interface drsuapi
 {
-       typedef bitmap samr_GroupAttrs samr_GroupAttrs;
+       typedef bitmap security_GroupAttrs security_GroupAttrs;
 
        /* see MS-DRSR section 5.39 */
        typedef [public,bitmap32bit] bitmap {
@@ -945,7 +945,7 @@ interface drsuapi
                [range(0,10000)] uint32 num_memberships;
                [range(0,10000)] uint32 num_sids;
                [size_is(num_memberships)] drsuapi_DsReplicaObjectIdentifier **info_array;
-               [size_is(num_memberships)] samr_GroupAttrs *group_attrs;
+               [size_is(num_memberships)] security_GroupAttrs *group_attrs;
                [size_is(num_sids)] dom_sid28 **sids;
        } drsuapi_DsGetMembershipsCtr1;
 

diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index b4474f7ec496dd1d5b221e79a00ba6bd54de7802..0f9bda8af81242b76ca357b3ff7d308702cb8175 100644 (file)
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -29,7 +29,7 @@ cpp_quote("#define ENC_HMAC_SHA1_96_AES256 KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96"
 interface netlogon
 {
        typedef bitmap samr_AcctFlags samr_AcctFlags;
-       typedef bitmap samr_GroupAttrs samr_GroupAttrs;
+       typedef bitmap security_GroupAttrs security_GroupAttrs;
        typedef enum netr_DeltaEnum8Bit netr_DeltaEnum8Bit;
        typedef enum netr_SamDatabaseID8Bit netr_SamDatabaseID8Bit;
 
@@ -274,7 +274,7 @@ interface netlogon
 
        typedef [public] struct {
                dom_sid2 *sid;
-               samr_GroupAttrs attributes;
+               security_GroupAttrs attributes;
        } netr_SidAttr;
 
        typedef [public] struct {

diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index b9d1d34ae33f9a01d3e4615e276368f93e1b11bc..867862dcd5cd8607bf386c38caf4f53fc4260a4f 100644 (file)
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -16,6 +16,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 ] interface samr
 {
        typedef bitmap security_secinfo security_secinfo;
+       typedef bitmap security_GroupAttrs security_GroupAttrs;
 
        /* account control (acct_flags) bits */
        typedef [public,bitmap32bit] bitmap {
@@ -565,29 +566,18 @@ import "misc.idl", "lsa.idl", "security.idl";
                [out,ref]     policy_handle *group_handle
                );
 
-       /* Group attributes */
-       typedef [public,bitmap32bit] bitmap {
-               SE_GROUP_MANDATORY              = 0x00000001,
-               SE_GROUP_ENABLED_BY_DEFAULT     = 0x00000002,
-               SE_GROUP_ENABLED                = 0x00000004,
-               SE_GROUP_OWNER                  = 0x00000008,
-               SE_GROUP_USE_FOR_DENY_ONLY      = 0x00000010,
-               SE_GROUP_RESOURCE               = 0x20000000,
-               SE_GROUP_LOGON_ID               = 0xC0000000
-       } samr_GroupAttrs;
-
        /************************/
        /* Function    0x14     */
 
        typedef struct {
                lsa_String name;
-               samr_GroupAttrs attributes;
+               security_GroupAttrs attributes;
                uint32 num_members;
                lsa_String description;
        } samr_GroupInfoAll;
 
        typedef struct {
-               samr_GroupAttrs attributes;
+               security_GroupAttrs attributes;
        } samr_GroupInfoAttributes;
 
        typedef struct {
@@ -651,7 +641,7 @@ import "misc.idl", "lsa.idl", "security.idl";
        typedef struct {
                uint32 count;
                [size_is(count)] uint32 *rids;
-               [size_is(count)] samr_GroupAttrs *attributes;
+               [size_is(count)] security_GroupAttrs *attributes;
        } samr_RidAttrArray;
 
        NTSTATUS samr_QueryGroupMember(
@@ -1090,7 +1080,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 
        typedef [public] struct {
                uint32 rid;
-               samr_GroupAttrs attributes;
+               security_GroupAttrs attributes;
        } samr_RidWithAttribute;
 
        typedef [public] struct {
@@ -1136,7 +1126,7 @@ import "misc.idl", "lsa.idl", "security.idl";
        typedef struct {
                uint32    idx;
                uint32    rid;
-               samr_GroupAttrs acct_flags;
+               security_GroupAttrs acct_flags;
                lsa_String account_name;
                lsa_String description;
        } samr_DispEntryFullGroup;

diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index dc4937458158f63b606a3275018e443dfd65f8e4..49f166f722e7bd5c42f23f073d66e7b6e6bc4c3c 100644 (file)
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -597,6 +597,17 @@ interface security
                [subcontext(4)] security_descriptor *sd;
        } sec_desc_buf;
 
+       /* Group attributes, used to be samr_GroupAttrs */
+       typedef [public,bitmap32bit] bitmap {
+               SE_GROUP_MANDATORY              = 0x00000001,
+               SE_GROUP_ENABLED_BY_DEFAULT     = 0x00000002,
+               SE_GROUP_ENABLED                = 0x00000004,
+               SE_GROUP_OWNER                  = 0x00000008,
+               SE_GROUP_USE_FOR_DENY_ONLY      = 0x00000010,
+               SE_GROUP_RESOURCE               = 0x20000000,
+               SE_GROUP_LOGON_ID               = 0xC0000000
+       } security_GroupAttrs;
+
        /* This is not yet sent over the network, but is simply defined in IDL */
        typedef [public] struct {
                uint32 num_sids;

diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py
index b3db24dcb4da95a381c0f84f37a3b1e0c113d174..652533272c8627c08c0fb0ca60f50643f033609d 100755 (executable)
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -566,7 +566,7 @@ class DynamicTokenTest(samba.tests.TestCase):
         rids = samr_conn.GetGroupsForUser(user_handle)
         samr_dns = set()
         for rid in rids.rids:
-            self.assertEqual(rid.attributes, samr.SE_GROUP_MANDATORY | samr.SE_GROUP_ENABLED_BY_DEFAULT | samr.SE_GROUP_ENABLED)
+            self.assertEqual(rid.attributes, security.SE_GROUP_MANDATORY | security.SE_GROUP_ENABLED_BY_DEFAULT | security.SE_GROUP_ENABLED)
             sid = "%s-%d" % (domain_sid, rid.rid)
             res = self.admin_ldb.search(base="<SID=%s>" % sid, scope=ldb.SCOPE_BASE,
                                         attrs=[])