summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-11-26 18:15:39 +0100
committerKarolin Seeger <kseeger@samba.org>2009-12-08 09:14:57 +0100
commit8b51fc98f10f99fc14e81232b920ff10de0e595a (patch)
tree6f00ebf86bbf08eef130207458d873e908046a08
parent949c99977e7f0d3c1b28f25ba8b238ceb484de62 (diff)
downloadsamba-8b51fc98f10f99fc14e81232b920ff10de0e595a.tar.gz
samba-8b51fc98f10f99fc14e81232b920ff10de0e595a.tar.xz
samba-8b51fc98f10f99fc14e81232b920ff10de0e595a.zip
s3-passdb: move some defines out of rpc headers (they really belong to passdb).
Guenther (cherry picked from commit 86f4536b7a128922b5d5808557e70fa243442361) (cherry picked from commit f583a0c75fd30aabec7728d574589f7c71370d91)
-rw-r--r--source3/include/passdb.h15
-rw-r--r--source3/include/rpc_misc.h16
2 files changed, 15 insertions, 16 deletions
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index c8e4bc21e41..9be2a697a60 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 58ea91683a4..e86c47f39a7 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