[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  86f4536... s3-passdb: move some defines out of rpc headers (they really belong to passdb).
      from  4d0fca4... s3-winbind: properly include netlogon.idl in wbint.idl.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 86f4536b7a128922b5d5808557e70fa243442361
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 18:15:39 2009 +0100

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

-----------------------------------------------------------------------

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


Changeset truncated at 500 lines:

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index c8e4bc2..9be2a69 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 58ea916..e86c47f 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


-- 
Samba Shared Repository