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 6f79432fe656164d4770dbce114a30dda5e7bf9a)

23 files changed, 29 insertions, 14 deletions

diff --git a/source4/include/db_wrap.h b/source4/include/db_wrap.h
index 6a12a1c9b2..c336461dbe 100644
--- a/source4/include/db_wrap.h
+++ b/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;
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 7d1ee5afc7..cef5e982c7 100644
--- a/source4/include/includes.h
+++ b/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"
diff --git a/source4/intl/lang_tdb.c b/source4/intl/lang_tdb.c
index 800bd547b5..660323682d 100644
--- a/source4/intl/lang_tdb.c
+++ b/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;
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c
index 854f772717..6028159377 100644
--- a/source4/lib/db_wrap.c
+++ b/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;
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 64cf8f41bf..140e3ff067 100644
--- a/source4/lib/events/events.c
+++ b/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
 
diff --git a/source4/lib/gencache.c b/source4/lib/gencache.c
index 160367cfe9..8688683e8d 100644
--- a/source4/lib/gencache.c
+++ b/source4/lib/gencache.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 
 #undef  DBGC_CLASS
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index 49052550d0..0c644ffe5e 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/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
 
diff --git a/source4/lib/tdb/common/spinlock.c b/source4/lib/tdb/common/spinlock.c
index 30bfd77962..001f0c3bc1 100644
--- a/source4/lib/tdb/common/spinlock.c
+++ b/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
diff --git a/source4/lib/tdb/common/tdb.c b/source4/lib/tdb/common/tdb.c
index 46b2499179..134ee8a4ea 100644
--- a/source4/lib/tdb/common/tdb.c
+++ b/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"
diff --git a/source4/lib/tdb/common/tdbutil.c b/source4/lib/tdb/common/tdbutil.c
index b5187162cf..02a1d66cbe 100644
--- a/source4/lib/tdb/common/tdbutil.c
+++ b/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"
diff --git a/source4/lib/tdb/include/tdb.h b/source4/lib/tdb/include/tdb.h
index f53503a1d6..1de5517d91 100644
--- a/source4/lib/tdb/include/tdb.h
+++ b/source4/lib/tdb/include/tdb.h
@@ -154,4 +154,6 @@ extern TDB_DATA tdb_null;
 }
 #endif
 
+#include "spinlock.h"
+
 #endif /* tdb.h */
diff --git a/source4/lib/tdb/include/tdbutil.h b/source4/lib/tdb/include/tdbutil.h
index cfa83bd937..80d93b7984 100644
--- a/source4/lib/tdb/include/tdbutil.h
+++ b/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 
diff --git a/source4/lib/tdb/tools/tdbdump.c b/source4/lib/tdb/tools/tdbdump.c
index dd018af6f5..8aa573ca9b 100644
--- a/source4/lib/tdb/tools/tdbdump.c
+++ b/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
diff --git a/source4/lib/tdb/tools/tdbtest.c b/source4/lib/tdb/tools/tdbtest.c
index f4854b5931..0a2185d6b8 100644
--- a/source4/lib/tdb/tools/tdbtest.c
+++ b/source4/lib/tdb/tools/tdbtest.c
@@ -16,6 +16,7 @@
 #else
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 
 #endif
 
diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c
index bb2313369b..63b3b0d381 100644
--- a/source4/lib/tdb/tools/tdbtorture.c
+++ b/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"
 
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index d0385fbb0b..e88e9638a3 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/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"
 
 /*
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index 3c206528dd..be6f356422 100644
--- a/source4/ntvfs/common/opendb.c
+++ b/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"
 
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 0ed878c1f0..529ff7a98b 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/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"
 
 
 /*
diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c
index 0184244aa8..29971ebeb5 100644
--- a/source4/ntvfs/posix/xattr_tdb.c
+++ b/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"
 
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index f837545999..288bc3a38e 100644
--- a/source4/param/loadparm.c
+++ b/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:
diff --git a/source4/passdb/secrets.c b/source4/passdb/secrets.c
index 14e5642ae2..89041fa4eb 100644
--- a/source4/passdb/secrets.c
+++ b/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
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 37a67ee56c..5439e5235a 100644
--- a/source4/smbd/process_standard.c
+++ b/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"
 
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 70a9227521..a0333b1c53 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 
 static TDB_CONTEXT *tdb;