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

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

4 files changed, 21 insertions, 20 deletions

diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index 448a58bcd1f..2aaae8dce59 100644
--- 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 b4474f7ec49..0f9bda8af81 100644
--- 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 b9d1d34ae33..867862dcd5c 100644
--- 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 dc493745815..49f166f722e 100644
--- 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;