r9574: - made the sec_info fields in lsa and samr use a IDL bitmap

- fixed winreg_GetKeySecurity() to use a sec_info field correctly

- simplied the winreg torture code, removing the separate opens for
  each hive

- added torture cleanup code in winreg test

- added 'create with security descriptor' in the winreg torture test
(This used to be commit f20695decd587f7b6bbdbd4861441bd19ab85078)

1 files changed, 9 insertions, 7 deletions

diff --git a/source4/librpc/idl/security.idl b/source4/librpc/idl/security.idl
index dd502b178f..cbdfba1ffb 100644
--- a/source4/librpc/idl/security.idl
+++ b/source4/librpc/idl/security.idl
@@ -297,13 +297,6 @@ interface security
 		SEC_DESC_SELF_RELATIVE		= 0x8000
 	} security_descriptor_type;
 
-	/* bits that determine which parts of a security descriptor
-	   are being queried/set */
-	const int SECINFO_OWNER                = 0x00000001;
-	const int SECINFO_GROUP                = 0x00000002;
-	const int SECINFO_DACL                 = 0x00000004;
-	const int SECINFO_SACL                 = 0x00000008;
-
 	typedef [public,flag(NDR_LITTLE_ENDIAN)] struct {
 		security_descriptor_revision revision;
 		security_descriptor_type type;     /* SEC_DESC_xxxx flags */
@@ -325,4 +318,13 @@ interface security
 		[size_is(num_sids)] dom_sid *sids[*];
 		udlong privilege_mask;
 	} security_token;
+
+	/* bits that determine which parts of a security descriptor
+	   are being queried/set */
+	typedef [public,bitmap32bit] bitmap {
+		SECINFO_OWNER                = 0x00000001,
+		SECINFO_GROUP                = 0x00000002,
+		SECINFO_DACL                 = 0x00000004,
+		SECINFO_SACL                 = 0x00000008
+	} security_secinfo;
 }