[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  4afdb5a... s3: move BASE_RID to main includes.h (in preparation to separate passdb).
       via  b83ab96... s3-passdb: moving account_pol.c into passdb.
      from  961993b... s3-merged: Make sure bin/ exists when copying in bin/smbtorture4.

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


- Log -----------------------------------------------------------------
commit 4afdb5a2a713985aed758a49144e23b2d0de842b
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 6 17:49:36 2010 +0200

    s3: move BASE_RID to main includes.h (in preparation to separate passdb).
    
    Guenther

commit b83ab96b16cd322d90bf84d8b71b523a2fda4aed
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 6 17:17:37 2010 +0200

    s3-passdb: moving account_pol.c into passdb.
    
    Guenther

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

Summary of changes:
 source3/Makefile.in                   |    2 +-
 source3/include/includes.h            |    2 ++
 source3/include/passdb.h              |    2 --
 source3/include/proto.h               |    2 +-
 source3/{lib => passdb}/account_pol.c |    1 -
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename source3/{lib => passdb}/account_pol.c (99%)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3184d03..c6986ed 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -671,7 +671,7 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
 		passdb/util_wellknown.o passdb/util_builtin.o passdb/pdb_compat.o \
 		passdb/util_unixsids.o passdb/lookup_sid.o \
 		passdb/login_cache.o @PDB_STATIC@ \
-		lib/account_pol.o $(PRIVILEGES_OBJ) \
+		passdb/account_pol.o $(PRIVILEGES_OBJ) \
 		lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ)
 
 DEVEL_HELP_WEIRD_OBJ = modules/weird.o
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9ab2556..ec1ac20 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -969,4 +969,6 @@ void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
 /* samba3 doesn't use uwrap yet */
 #define uwrap_enabled() 0
 
+#define BASE_RID (0x000003E8L)
+
 #endif /* _INCLUDES_H */
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 3ebf72d..1d0f5c1 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -28,8 +28,6 @@
  * NT RIDS.
  **********************************************************************/
 
-#define BASE_RID (0x000003E8L)
-
 /* Take the bottom bit. */
 #define RID_TYPE_MASK 		1
 #define RID_MULTIPLIER 		2
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a3ba747..10c3d14 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -313,7 +313,7 @@ bool allow_access(const char **deny_list,
 		const char *caddr);
 bool check_access(int sock, const char **allow_list, const char **deny_list);
 
-/* The following definitions come from lib/account_pol.c  */
+/* The following definitions come from passdb/account_pol.c  */
 
 void account_policy_names_list(const char ***names, int *num_names);
 const char *decode_account_policy_name(enum pdb_policy_type type);
diff --git a/source3/lib/account_pol.c b/source3/passdb/account_pol.c
similarity index 99%
rename from source3/lib/account_pol.c
rename to source3/passdb/account_pol.c
index f4101e9..7a3e7de 100644
--- a/source3/lib/account_pol.c
+++ b/source3/passdb/account_pol.c
@@ -451,4 +451,3 @@ struct db_context *get_account_pol_db( void )
 
 	return db;
 }
-


-- 
Samba Shared Repository