s3-passdb: move some defines out of rpc headers (they really belong to passdb).

Guenther

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index c8e4bc21e41c4975335c85821b5d49550ee6a635..9be2a697a606ad932ad373a4b527f8ffadf497d5 100644 (file)
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -23,6 +23,21 @@
 #ifndef _PASSDB_H
 #define _PASSDB_H
 
 #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
  */
 /*
  * bit flags representing initialized fields in struct samu
  */

diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 58ea91683a4b4add3896872b6adbade0d0569744..e86c47f39a7f57838002a70dfeea4bf3d41e456c 100644 (file)
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -66,22 +66,6 @@
 #define BUILTIN_ALIAS_RID_PRE_2K_ACCESS (0x0000022aL)
 
 
 #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
 
 /********************************************************************** 
  * RPC policy handle used pretty much everywhere