r5296: - only include the tdb headers where they are needed

- removed the u32 hack in events.c as I think this was only needed as
  tdb.h defines u32. Metze, can you check that this hack is indeed no
  longer needed on your suse system?
(This used to be commit 6f79432fe6)

source4/include/db_wrap.h

@@ -29,7 +29,7 @@ struct ldb_wrap {
 
 
 struct tdb_wrap {
-	TDB_CONTEXT *tdb;
+	struct tdb_context *tdb;
 
 	const char *name;
 	struct tdb_wrap *next, *prev;

source4/include/includes.h

@@ -113,9 +113,6 @@ extern int errno;
 #include "lib/talloc/talloc.h"
 #include "nt_status.h"
 #include "structs.h"
-#include "lib/tdb/include/tdb.h"
-#include "lib/tdb/include/spinlock.h"
-#include "lib/tdb/include/tdbutil.h"
 #include "db_wrap.h"
 #include "trans2.h"
 #include "nterr.h"

source4/intl/lang_tdb.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 
 static TDB_CONTEXT *tdb;

source4/lib/db_wrap.c

@@ -29,6 +29,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
 
 static struct ldb_wrap *ldb_list;

source4/lib/events/events.c

@@ -66,8 +66,6 @@
 #endif
 
 #if WITH_EPOLL
-/* this #undef is needed on my SuSE 9.2 Box with glibc-devel-2.3.3-118 */
-#undef u32
 #include <sys/epoll.h>
 #endif
 

source4/lib/gencache.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 
 #undef  DBGC_CLASS

source4/lib/ldb/ldb_tdb/ldb_tdb.h

@@ -1,5 +1,7 @@
 
-#ifndef _SAMBA_BUILD_
+#ifdef _SAMBA_BUILD_
+#include "lib/tdb/include/tdb.h"
+#else
 #include "tdb.h"
 #endif
 

source4/lib/tdb/common/spinlock.c

@@ -38,11 +38,11 @@
 #include <time.h>
 #include <signal.h>
 #include "tdb.h"
-#include "spinlock.h"
 
 #define DEBUG
 #else
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #endif
 
 #ifdef USE_SPINLOCKS

source4/lib/tdb/common/tdb.c

@@ -63,9 +63,9 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include "tdb.h"
-#include "spinlock.h"
 #else
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "system/time.h"
 #include "system/shmem.h"
 #include "system/filesys.h"

source4/lib/tdb/common/tdbutil.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 #include "system/glob.h"
 #include "system/wait.h"
 #include "dlinklist.h"

source4/lib/tdb/include/tdb.h

@@ -154,4 +154,6 @@ extern TDB_DATA tdb_null;
 }
 #endif
 
+#include "spinlock.h"
+
 #endif /* tdb.h */

source4/lib/tdb/include/tdbutil.h

@@ -21,6 +21,8 @@
 #ifndef __TDBUTIL_H__
 #define __TDBUTIL_H__
 
+#include "tdb.h"
+
 
 /* single node of a list returned by tdb_search_keys */
 typedef struct keys_node 

source4/lib/tdb/tools/tdbdump.c

@@ -37,6 +37,7 @@
 #else
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "system/iconv.h"
 
 #endif

source4/lib/tdb/tools/tdbtest.c

@@ -16,6 +16,7 @@
 #else
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 
 #endif
 

source4/lib/tdb/tools/tdbtorture.c

@@ -21,6 +21,7 @@
 #else
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "system/time.h"
 #include "system/wait.h"
 

source4/ntvfs/common/brlock.c

@@ -26,6 +26,7 @@
    used. This allows us to provide the same semantics as NT */
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "messages.h"
 
 /*

source4/ntvfs/common/opendb.c

@@ -39,6 +39,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "messages.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

source4/ntvfs/posix/vfs_posix.c

@@ -28,6 +28,7 @@
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "smbd/service_stream.h"
+#include "lib/tdb/include/tdb.h"
 
 
 /*

source4/ntvfs/posix/xattr_tdb.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
+#include "lib/tdb/include/tdb.h"
 
 #define XATTR_LIST_ATTR ".xattr_list"
 

source4/param/loadparm.c

@@ -133,7 +133,7 @@ struct parm_struct
 		int ivalue;
 		char *svalue;
 		char cvalue;
-		char **lvalue;
+		const char **lvalue;
 	} def;
 };
 
@@ -1431,8 +1431,8 @@ const char *lp_parm_string(int lookup_service, const char *type, const char *opt
 /* Parametric option has following syntax: 'Type: option = value' */
 /* Returned value is allocated in 'lp_talloc' context */
 
-char **lp_parm_string_list(int lookup_service, const char *type, const char *option,
-			   const char *separator)
+const char **lp_parm_string_list(int lookup_service, const char *type, const char *option,
+				 const char *separator)
 {
 	const char *value = get_parametrics(lookup_service, type, option);
 	
@@ -1855,7 +1855,7 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
 					strupper(*(char **)dest_ptr);
 					break;
 				case P_LIST:
-					*(char ***)dest_ptr = str_list_copy(NULL, *(const char ***)src_ptr);
+					*(const char ***)dest_ptr = str_list_copy(NULL, *(const char ***)src_ptr);
 					break;
 				default:
 					break;
@@ -2367,7 +2367,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 			break;
 
 		case P_LIST:
-			*(char ***)parm_ptr = str_list_make(NULL, pszParmValue, NULL);
+			*(const char ***)parm_ptr = str_list_make(NULL, pszParmValue, NULL);
 			break;
 
 		case P_STRING:

source4/passdb/secrets.c

@@ -23,6 +23,7 @@
    such as the local SID and machine trust password */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 #include "secrets.h"
 
 #undef DBGC_CLASS

source4/smbd/process_standard.c

@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "lib/tdb/include/tdb.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 

source4/torture/basic/mangle_test.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 
 static TDB_CONTEXT *tdb;