From 58db2befbd82b8e1e7cb7de29da7f567dea314e9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 26 Nov 2008 18:20:51 +0100
Subject: Move netr_SamDatabaseID8Bit to netlogon.idl to prevent problems with
 forward enum declarations when compiled with C++.

---
 librpc/idl/misc.idl       | 19 -------------------
 librpc/idl/netlogon.idl   |  2 ++
 librpc/idl/samr.idl       | 16 ++++++++++++++++
 librpc/ndr/ndr_netlogon.c |  1 +
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'librpc')

diff --git a/librpc/idl/misc.idl b/librpc/idl/misc.idl
index 1182ef1fc2..1907195252 100644
--- a/librpc/idl/misc.idl
+++ b/librpc/idl/misc.idl
@@ -2,15 +2,11 @@
   miscellaneous IDL structures
 */
 
-cpp_quote("#define netr_SamDatabaseID8Bit netr_SamDatabaseID")
-
 [
 	pointer_default(unique)
 ]
 interface misc
 {
-	typedef enum netr_SamDatabaseID8Bit netr_SamDatabaseID8Bit;
-
 	typedef [public,noprint,gensize,noejs] struct {
 		uint32 time_low;
 		uint16 time_mid;
@@ -39,19 +35,4 @@ interface misc
 		SEC_CHAN_DOMAIN      = 4,
 		SEC_CHAN_BDC         = 6
 	} netr_SchannelType;
-
-	/* SAM database types */
-	typedef [public,v1_enum] enum {
-		SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
-		SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
-		SAM_DATABASE_PRIVS   = 2 /* Privileges */
-	} netr_SamDatabaseID;
-
-	typedef [public,v1_enum] enum {
-		SAMR_REJECT_OTHER      = 0,
-		SAMR_REJECT_TOO_SHORT  = 1,
-		SAMR_REJECT_IN_HISTORY = 2,
-		SAMR_REJECT_COMPLEXITY = 5
-	} samr_RejectReason;
-
 }
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index e9b5170e9d..cf4da7adfa 100644
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -9,6 +9,7 @@ import "misc.idl", "lsa.idl", "samr.idl", "security.idl", "nbt.idl";
 #include "idl_types.h"
 
 cpp_quote("#define netr_DeltaEnum8Bit netr_DeltaEnum")
+cpp_quote("#define netr_SamDatabaseID8Bit netr_SamDatabaseID")
 
 [
   uuid("12345678-1234-abcd-ef00-01234567cffb"),
@@ -23,6 +24,7 @@ interface netlogon
 	typedef bitmap samr_AcctFlags samr_AcctFlags;
 	typedef bitmap samr_GroupAttrs samr_GroupAttrs;
 	typedef enum netr_DeltaEnum8Bit netr_DeltaEnum8Bit;
+	typedef enum netr_SamDatabaseID8Bit netr_SamDatabaseID8Bit;
 
 	/*****************/
 	/* Function 0x00 */
diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index ee179407d4..6ef069ac4b 100644
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -17,6 +17,22 @@ import "misc.idl", "lsa.idl", "security.idl";
 {
 	typedef bitmap security_secinfo security_secinfo;
 
+	/* SAM database types */
+	typedef [public,v1_enum] enum {
+		SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
+		SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
+		SAM_DATABASE_PRIVS   = 2 /* Privileges */
+	} netr_SamDatabaseID;
+
+	typedef [public,v1_enum] enum {
+		SAMR_REJECT_OTHER      = 0,
+		SAMR_REJECT_TOO_SHORT  = 1,
+		SAMR_REJECT_IN_HISTORY = 2,
+		SAMR_REJECT_COMPLEXITY = 5
+	} samr_RejectReason;
+
+
+
 	/* account control (acct_flags) bits */
 	typedef [public,bitmap32bit] bitmap {
 		ACB_DISABLED			= 0x00000001,  /* 1 = User account disabled */
diff --git a/librpc/ndr/ndr_netlogon.c b/librpc/ndr/ndr_netlogon.c
index 61a88c7a47..411f3b9ba0 100644
--- a/librpc/ndr/ndr_netlogon.c
+++ b/librpc/ndr/ndr_netlogon.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_samr.h"
 
 _PUBLIC_ enum ndr_err_code ndr_push_netr_SamDatabaseID8Bit(struct ndr_push *ndr, int ndr_flags, enum netr_SamDatabaseID8Bit r)
 {
-- 
cgit