From 86f4536b7a128922b5d5808557e70fa243442361 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 26 Nov 2009 18:15:39 +0100
Subject: s3-passdb: move some defines out of rpc headers (they really belong
 to passdb).

Guenther
---
 source3/include/passdb.h   | 15 +++++++++++++++
 source3/include/rpc_misc.h | 16 ----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index c8e4bc21e4..9be2a697a6 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -23,6 +23,21 @@
 #ifndef _PASSDB_H
 #define _PASSDB_H
 
+/**********************************************************************
+ * Masks for mappings between unix uid and gid types and
+ * NT RIDS.
+ **********************************************************************/
+
+#define BASE_RID (0x000003E8L)
+
+/* Take the bottom bit. */
+#define RID_TYPE_MASK 		1
+#define RID_MULTIPLIER 		2
+
+/* The two common types. */
+#define USER_RID_TYPE 		0
+#define GROUP_RID_TYPE 		1
+
 /*
  * bit flags representing initialized fields in struct samu
  */
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 58ea91683a..e86c47f39a 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -66,22 +66,6 @@
 #define BUILTIN_ALIAS_RID_PRE_2K_ACCESS (0x0000022aL)
 
 
-/********************************************************************** 
- * Masks for mappings between unix uid and gid types and
- * NT RIDS.
- **********************************************************************/
-
-#define BASE_RID (0x000003E8L)
-
-/* Take the bottom bit. */
-#define RID_TYPE_MASK 		1
-#define RID_MULTIPLIER 		2
-
-/* The two common types. */
-#define USER_RID_TYPE 		0
-#define GROUP_RID_TYPE 		1
-
-
 
 /********************************************************************** 
  * RPC policy handle used pretty much everywhere
-- 
cgit