s3: re-run make samba3-idl.

Guenther

5 files changed, 23 insertions, 35 deletions

diff --git a/librpc/gen_ndr/cli_winreg.c b/librpc/gen_ndr/cli_winreg.c
index 57e78a7cd2..208ca66b1e 100644
--- a/librpc/gen_ndr/cli_winreg.c
+++ b/librpc/gen_ndr/cli_winreg.c
@@ -939,7 +939,7 @@ struct tevent_req *rpccli_winreg_CreateKey_send(TALLOC_CTX *mem_ctx,
 						struct policy_handle *_handle /* [in] [ref] */,
 						struct winreg_String _name /* [in]  */,
 						struct winreg_String _keyclass /* [in]  */,
-						enum winreg_KeyType _options /* [in]  */,
+						uint32_t _options /* [in]  */,
 						uint32_t _access_mask /* [in]  */,
 						struct winreg_SecBuf *_secdesc /* [in] [unique] */,
 						struct policy_handle *_new_handle /* [out] [ref] */,
@@ -1058,7 +1058,7 @@ NTSTATUS rpccli_winreg_CreateKey(struct rpc_pipe_client *cli,
 				 struct policy_handle *handle /* [in] [ref] */,
 				 struct winreg_String name /* [in]  */,
 				 struct winreg_String keyclass /* [in]  */,
-				 enum winreg_KeyType options /* [in]  */,
+				 uint32_t options /* [in]  */,
 				 uint32_t access_mask /* [in]  */,
 				 struct winreg_SecBuf *secdesc /* [in] [unique] */,
 				 struct policy_handle *new_handle /* [out] [ref] */,
@@ -2388,7 +2388,7 @@ struct tevent_req *rpccli_winreg_OpenKey_send(TALLOC_CTX *mem_ctx,
 					      struct rpc_pipe_client *cli,
 					      struct policy_handle *_parent_handle /* [in] [ref] */,
 					      struct winreg_String _keyname /* [in]  */,
-					      enum winreg_KeyType _options /* [in]  */,
+					      uint32_t _options /* [in]  */,
 					      uint32_t _access_mask /* [in]  */,
 					      struct policy_handle *_handle /* [out] [ref] */)
 {
@@ -2497,7 +2497,7 @@ NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
 			       struct policy_handle *parent_handle /* [in] [ref] */,
 			       struct winreg_String keyname /* [in]  */,
-			       enum winreg_KeyType options /* [in]  */,
+			       uint32_t options /* [in]  */,
 			       uint32_t access_mask /* [in]  */,
 			       struct policy_handle *handle /* [out] [ref] */,
 			       WERROR *werror)
diff --git a/librpc/gen_ndr/cli_winreg.h b/librpc/gen_ndr/cli_winreg.h
index 670958e70c..4ed75fdb3e 100644
--- a/librpc/gen_ndr/cli_winreg.h
+++ b/librpc/gen_ndr/cli_winreg.h
@@ -93,7 +93,7 @@ struct tevent_req *rpccli_winreg_CreateKey_send(TALLOC_CTX *mem_ctx,
 						struct policy_handle *_handle /* [in] [ref] */,
 						struct winreg_String _name /* [in]  */,
 						struct winreg_String _keyclass /* [in]  */,
-						enum winreg_KeyType _options /* [in]  */,
+						uint32_t _options /* [in]  */,
 						uint32_t _access_mask /* [in]  */,
 						struct winreg_SecBuf *_secdesc /* [in] [unique] */,
 						struct policy_handle *_new_handle /* [out] [ref] */,
@@ -106,7 +106,7 @@ NTSTATUS rpccli_winreg_CreateKey(struct rpc_pipe_client *cli,
 				 struct policy_handle *handle /* [in] [ref] */,
 				 struct winreg_String name /* [in]  */,
 				 struct winreg_String keyclass /* [in]  */,
-				 enum winreg_KeyType options /* [in]  */,
+				 uint32_t options /* [in]  */,
 				 uint32_t access_mask /* [in]  */,
 				 struct winreg_SecBuf *secdesc /* [in] [unique] */,
 				 struct policy_handle *new_handle /* [out] [ref] */,
@@ -249,7 +249,7 @@ struct tevent_req *rpccli_winreg_OpenKey_send(TALLOC_CTX *mem_ctx,
 					      struct rpc_pipe_client *cli,
 					      struct policy_handle *_parent_handle /* [in] [ref] */,
 					      struct winreg_String _keyname /* [in]  */,
-					      enum winreg_KeyType _options /* [in]  */,
+					      uint32_t _options /* [in]  */,
 					      uint32_t _access_mask /* [in]  */,
 					      struct policy_handle *_handle /* [out] [ref] */);
 NTSTATUS rpccli_winreg_OpenKey_recv(struct tevent_req *req,
@@ -259,7 +259,7 @@ NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli,
 			       TALLOC_CTX *mem_ctx,
 			       struct policy_handle *parent_handle /* [in] [ref] */,
 			       struct winreg_String keyname /* [in]  */,
-			       enum winreg_KeyType options /* [in]  */,
+			       uint32_t options /* [in]  */,
 			       uint32_t access_mask /* [in]  */,
 			       struct policy_handle *handle /* [out] [ref] */,
 			       WERROR *werror);
diff --git a/librpc/gen_ndr/ndr_winreg.c b/librpc/gen_ndr/ndr_winreg.c
index fcb65d42f9..1e0a5bad7d 100644
--- a/librpc/gen_ndr/ndr_winreg.c
+++ b/librpc/gen_ndr/ndr_winreg.c
@@ -217,30 +217,28 @@ _PUBLIC_ void ndr_print_winreg_SecBuf(struct ndr_print *ndr, const char *name, c
 	ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_KeyType(struct ndr_push *ndr, int ndr_flags, enum winreg_KeyType r)
+static enum ndr_err_code ndr_push_winreg_KeyType(struct ndr_push *ndr, int ndr_flags, uint32_t r)
 {
-	NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
+	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
 	return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_KeyType(struct ndr_pull *ndr, int ndr_flags, enum winreg_KeyType *r)
+static enum ndr_err_code ndr_pull_winreg_KeyType(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
 {
 	uint32_t v;
-	NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
+	NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
 	*r = v;
 	return NDR_ERR_SUCCESS;
 }
 
-_PUBLIC_ void ndr_print_winreg_KeyType(struct ndr_print *ndr, const char *name, enum winreg_KeyType r)
+_PUBLIC_ void ndr_print_winreg_KeyType(struct ndr_print *ndr, const char *name, uint32_t r)
 {
-	const char *val = NULL;
-
-	switch (r) {
-		case REG_KEYTYPE_NON_VOLATILE: val = "REG_KEYTYPE_NON_VOLATILE"; break;
-		case REG_KEYTYPE_VOLATILE: val = "REG_KEYTYPE_VOLATILE"; break;
-		case REG_KEYTYPE_SYMLINK: val = "REG_KEYTYPE_SYMLINK"; break;
-	}
-	ndr_print_enum(ndr, name, "ENUM", val, r);
+	ndr_print_uint32(ndr, name, r);
+	ndr->depth++;
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "REG_KEYTYPE_NON_VOLATILE", REG_KEYTYPE_NON_VOLATILE, r);
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "REG_KEYTYPE_VOLATILE", REG_KEYTYPE_VOLATILE, r);
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "REG_KEYTYPE_SYMLINK", REG_KEYTYPE_SYMLINK, r);
+	ndr->depth--;
 }
 
 static enum ndr_err_code ndr_push_winreg_CreateAction(struct ndr_push *ndr, int ndr_flags, enum winreg_CreateAction r)
diff --git a/librpc/gen_ndr/ndr_winreg.h b/librpc/gen_ndr/ndr_winreg.h
index 39f10e2ee6..27894453cc 100644
--- a/librpc/gen_ndr/ndr_winreg.h
+++ b/librpc/gen_ndr/ndr_winreg.h
@@ -90,7 +90,7 @@ enum ndr_err_code ndr_pull_winreg_String(struct ndr_pull *ndr, int ndr_flags, st
 void ndr_print_winreg_String(struct ndr_print *ndr, const char *name, const struct winreg_String *r);
 void ndr_print_KeySecurityData(struct ndr_print *ndr, const char *name, const struct KeySecurityData *r);
 void ndr_print_winreg_SecBuf(struct ndr_print *ndr, const char *name, const struct winreg_SecBuf *r);
-void ndr_print_winreg_KeyType(struct ndr_print *ndr, const char *name, enum winreg_KeyType r);
+void ndr_print_winreg_KeyType(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_winreg_CreateAction(struct ndr_print *ndr, const char *name, enum winreg_CreateAction r);
 void ndr_print_winreg_StringBuf(struct ndr_print *ndr, const char *name, const struct winreg_StringBuf *r);
 void ndr_print_winreg_ValNameBuf(struct ndr_print *ndr, const char *name, const struct winreg_ValNameBuf *r);
diff --git a/librpc/gen_ndr/winreg.h b/librpc/gen_ndr/winreg.h
index aa05148583..7ebc847565 100644
--- a/librpc/gen_ndr/winreg.h
+++ b/librpc/gen_ndr/winreg.h
@@ -42,20 +42,10 @@ struct winreg_SecBuf {
 	uint8_t inherit;
 };
 
-enum winreg_KeyType
-#ifndef USE_UINT_ENUMS
- {
-	REG_KEYTYPE_NON_VOLATILE=(int)(0x00000000),
-	REG_KEYTYPE_VOLATILE=(int)(0x00000001),
-	REG_KEYTYPE_SYMLINK=(int)(0x00000002)
-}
-#else
- { __donnot_use_enum_winreg_KeyType=0x7FFFFFFF}
+/* bitmap winreg_KeyType */
 #define REG_KEYTYPE_NON_VOLATILE ( 0x00000000 )
 #define REG_KEYTYPE_VOLATILE ( 0x00000001 )
 #define REG_KEYTYPE_SYMLINK ( 0x00000002 )
-#endif
-;
 
 enum winreg_CreateAction
 #ifndef USE_UINT_ENUMS
@@ -192,7 +182,7 @@ struct winreg_CreateKey {
 		struct policy_handle *handle;/* [ref] */
 		struct winreg_String name;
 		struct winreg_String keyclass;
-		enum winreg_KeyType options;
+		uint32_t options;
 		uint32_t access_mask;
 		struct winreg_SecBuf *secdesc;/* [unique] */
 		enum winreg_CreateAction *action_taken;/* [unique] */
@@ -338,7 +328,7 @@ struct winreg_OpenKey {
 	struct {
 		struct policy_handle *parent_handle;/* [ref] */
 		struct winreg_String keyname;
-		enum winreg_KeyType options;
+		uint32_t options;
 		uint32_t access_mask;
 	} in;