Fix headers, ldb_includes.h is a private header,

do not reference it from ldb.h

diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index 01f5188b6f45c25512b7fd8a1c0d603e0f092784..583d1dcf042e1a2a7bfc7dfa006132e4d5729386 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -89,7 +89,7 @@ ldb_samldb_OBJ_FILES = \
 [MODULE::ldb_samba3sam]
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = LDB_MODULE(samba3sam)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS SMBPASSWD \
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB SMBPASSWD \
                        NSS_WRAPPER LIBSECURITY NDR_SECURITY
 # End MODULE ldb_samldb
 ################################################
@@ -102,7 +102,7 @@ ldb_samba3sam_OBJ_FILES = \
 [MODULE::ldb_simple_ldap_map]
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBNDR
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB LIBNDR
 ENABLE = YES
 ALIASES = entryuuid nsuniqueid
 # End MODULE ldb_entryuuid

diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 2365a58f78ac3f88dc38bebf22d1b58420d12eb8..4e28c8a1496b8d85846ffdcd67412caba845bda5 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -30,6 +30,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
+#include "dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 
 struct la_op_store {

diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 0261bb32e9274d6026f2234cdb1373d8c3a3f370..898d9139659598745acebe4ebb554e23aa4bdb7f 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -35,6 +35,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
+#include "dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source4/dsdb/samdb/ldb_modules/ranged_results.c b/source4/dsdb/samdb/ldb_modules/ranged_results.c
index 8f36baa7d6382e654a75c0c26c26748c6c6dc94b..5ce69a26a2f1958c80ceae7e09105eed388b7af5 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/ranged_results.c
+++ b/source4/dsdb/samdb/ldb_modules/ranged_results.c
@@ -29,6 +29,7 @@
  *  Author: Andrew Bartlett
  */
 
+#include "includes.h"
 #include "ldb_module.h"
 
 struct rr_context {

diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index 3f10748085305a202501aaf0edb578cd1b979f7a..59cb9de71701fc1ae70970a0dd58c122fcc47613 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -6,7 +6,7 @@
 */
 
 #include "includes.h"
-#include "ldb/include/ldb_module.h"
+#include "ldb_module.h"
 #include "ldb/ldb_map/ldb_map.h"
 #include "system/passwd.h"
 

diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 8920afee71a439641649666559ef9ca6c58221bc..f1b6863cdbe0ea6ecb269930b331b0bb9ec6f044 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -29,6 +29,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
+#include "dlinklist.h"
 #include "auth/credentials/credentials.h"
 #include "auth/credentials/credentials_krb5.h"
 #include "system/kerberos.h"

diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index d6b3e40e1afbf40739f1f3c2d0e14a86bbe20e70..6abd8a8f883e3f0e49097eeb91b2892b6735c047 100644 (file)
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb/include/ldb_module.h"
 #include "param/param.h"

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 7f00e8ebee4f8f3aa3d5b8eca840249e3ba08753..663dea9f807d5481692d229c0b15628fa180619c 100644 (file)
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -67,7 +67,7 @@ MDLD_FLAGS = @MDLD_FLAGS@
 
 OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TEVENT_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) 
 
-headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h $(srcdir)/include/ldb_handlers.h $(srcdir)/include/ldb_includes.h $(srcdir)/include/ldb_module.h
+headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h $(srcdir)/include/ldb_handlers.h $(srcdir)/include/ldb_module.h
 
 BINS = bin/ldbadd bin/ldbsearch bin/ldbdel bin/ldbmodify bin/ldbedit bin/ldbrename bin/ldbtest
 

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 99a47767e12a7f65a14b62c3330c36573b43c4cd..ae97ef4cced4db84ed7490aee01167165f32abb4 100644 (file)
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -32,10 +32,7 @@
  */
 
 #include "ldb_private.h"
-
-#if (_SAMBA_BUILD_ >= 4)
-#include "includes.h"
-#endif
+#include "dlinklist.h"
 
 #define LDB_MODULE_PREFIX      "modules:"
 #define LDB_MODULE_PREFIX_LEN  8

diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 6990397a741caa5ad58bd97deb95e40cef582b49..eb8e0ed11e4309a28f7728b0a492be0377a2b1fc 100644 (file)
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -46,7 +46,19 @@
 #define _LDB_H_ 1
 /*! \endcond */
 
-#include "ldb_includes.h"
+#ifndef bool
+typedef int bool;
+#endif
+#ifndef true
+#define true 1
+#endif
+#ifndef false
+#define false 0
+#endif
+
+#include "talloc.h"
+#include "tevent.h"
+#include "ldb_errors.h"
 
 /*
   major restrictions as compared to normal LDAP:

diff --git a/source4/lib/ldb/include/ldb_includes.h b/source4/lib/ldb/include/ldb_includes.h
index a2927139c877855ef496e5254b814fc02f07f238..602bbec32cc25b0ace09cde7dc533370940f3f02 100644 (file)
--- a/source4/lib/ldb/include/ldb_includes.h
+++ b/source4/lib/ldb/include/ldb_includes.h
@@ -4,11 +4,6 @@
   a temporary includes file until I work on the ldb build system
 */
 
-#if (_SAMBA_BUILD_ >= 4)
-/* tell ldb we have the internal ldap code */
-#define HAVE_ILDAP 1
-#endif
-
 #if (_SAMBA_BUILD_ <= 3)
 /* allow forbidden string functions - should be replaced with _m functions */
 #undef strcasecmp
@@ -19,9 +14,5 @@
 #include "replace.h"
 #include "system/filesys.h"
 #include "system/time.h"
-#include <talloc.h>
-#include <tevent.h>
-#include "ldb_errors.h"
-#include "dlinklist.h"
 
 #endif /*_LDB_PRIVATE_INCLUDES_H_*/

diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h
index 1ce9e9ecfd51dbb039f061216611e16bbc0ccf26..2e8da9941ca8e38a713969216f9b81bc5d51f6c9 100644 (file)
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -37,6 +37,7 @@
 #ifndef _LDB_PRIVATE_H_
 #define _LDB_PRIVATE_H_ 1
 
+#include "ldb_includes.h"
 #include "ldb.h"
 #include "ldb_module.h"
 
@@ -109,10 +110,6 @@ struct ldb_context {
        struct tevent_context *ev_ctx;
 };
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-#endif
-
 /* The following definitions come from lib/ldb/common/ldb.c  */
 
 int ldb_connect_backend(struct ldb_context *ldb, const char *url, const char *options[],

diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index b13440504893946ebbc79663006ae3fb6f4f2d69..4447d0e09a473b8af1ca6983d73ff8d5f3394f0a 100644 (file)
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -40,11 +40,10 @@
  *    author: Simo Sorce
  */
 
-
 #include "includes.h"
 #include "ldb_module.h"
+#include "dlinklist.h"
 
-#include "tevent.h"
 #include "libcli/ldap/ldap.h"
 #include "libcli/ldap/ldap_client.h"
 #include "auth/auth.h"

diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index e1fcdb13531ec13d481f4da5f09faa930d992af6..43a01f75a73baa5f7c3805c745bd6c0ddac07bdb 100644 (file)
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -38,6 +38,7 @@
  *    author: Simo Sorce
  */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
 #define LDAP_DEPRECATED 1

diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
index ea2bfd1dc14c3bbaeb1fa03c83c91aacc5435633..959540374cc566a275b6b25983b6a79a332a1d30 100644 (file)
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -35,8 +35,6 @@
  *  Author: Jelmer Vernooij, Martin Kuehl
  */
 
-#include "ldb_module.h"
-
 #include "ldb_map.h"
 #include "ldb_map_private.h"
 

diff --git a/source4/lib/ldb/ldb_map/ldb_map.h b/source4/lib/ldb/ldb_map/ldb_map.h
index 872208174ea9c13eb614727e351f82b6e32efb53..3c1fe808957d435f87333e3944fe4616ac4a978b 100644 (file)
--- a/source4/lib/ldb/ldb_map/ldb_map.h
+++ b/source4/lib/ldb/ldb_map/ldb_map.h
@@ -26,6 +26,8 @@
 #ifndef __LDB_MAP_H__
 #define __LDB_MAP_H__
 
+#include "ldb_module.h"
+
 /* ldb_map is a skeleton LDB module that can be used for any other modules
  * that need to map attributes.
  *

diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
index e915a5f46a38fe073c51f37010ca8dddd896917b..822dea654ec2bff6d8bb0f3bc0004c55c9fea6c0 100644 (file)
--- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
@@ -24,8 +24,6 @@
 
 */
 
-#include "ldb_module.h"
-
 #include "ldb_map.h"
 #include "ldb_map_private.h"
 

diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index 327fa92f8d206e868a9d47d194bec2ec1eb420e1..eb7b4590baf80a28144bd6d3e8debba1c0a88f5e 100644 (file)
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -25,8 +25,6 @@
 
 */
 
-#include "ldb_module.h"
-
 #include "ldb_map.h"
 #include "ldb_map_private.h"
 

diff --git a/source4/lib/ldb/ldb_map/ldb_map_private.h b/source4/lib/ldb/ldb_map/ldb_map_private.h
index 0c46443253738870a605d2309e84259e45050010..612d215ae95b6965a09844b70155f34e8930f25c 100644 (file)
--- a/source4/lib/ldb/ldb_map/ldb_map_private.h
+++ b/source4/lib/ldb/ldb_map/ldb_map_private.h
@@ -1,3 +1,4 @@
+#include "ldb_includes.h"
 
 /* A handy macro to report Out of Memory conditions */
 #define map_oom(module) ldb_set_errstring(ldb_module_get_ctx(module), talloc_asprintf(module, "Out of Memory"));

diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index cdbef3944b531fa70922d43e5cc9970d69f4e93d..ad27c9a9a9a9d77f7b8a9b397f30451731852ca5 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -32,6 +32,7 @@
  */
 
 #include "ldb_tdb.h"
+#include "dlinklist.h"
 
 /*
   the idxptr code is a bit unusual. The way it works is to replace

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index 7ebf199f6f5c3a64a418ef81229d50cc809f272d..0a06cdb1b0816583b5bf74f3266227948bdc7146 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -1,11 +1,5 @@
-#if (_SAMBA_BUILD_ == 3)
-#include "tdb/include/tdb.h"
-#else
-#include "replace.h"
-#include "system/wait.h"
+#include "ldb_includes.h"
 #include "tdb.h"
-#endif
-
 #include "ldb_module.h"
 
 /* this private structure is used by the ltdb backend in the

diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c
index d862638389ca6302f8c7d4fd4afda52976a336cc..43b223b52e19f078a5adaf483a5123d8352a3e32 100644 (file)
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -73,8 +73,13 @@
   modifiersName: not supported by w2k3?
 */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
+#endif
+
 /*
   construct a canonical name from a message
 */

diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index 7d7cdf66a059e7f439f2d1c5febf443765f5245f..2a06c5e6c5d62a89124bfb3f755a7da073843255 100644 (file)
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -32,6 +32,7 @@
  *  Author: Simo Sorce
  */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
 struct message_store {

diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index a5ffcc034a092a2e807a44c755ab9e893b7249ef..880678d89de4f576dd808573babdffca2e456724 100644 (file)
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -36,6 +36,7 @@
  *      Simo Sorce Mar 2006
  */
 
+#include "ldb_includes.h"
 #include "ldb_module.h"
 
 struct rename_context {

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 3dce9b187bab72471aeb82651c1bf1eaed3ba692..2701de5a481dcf7cca4dc757053c2dc0e3b059b4 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -21,6 +21,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "ldb_includes.h"
 #include "ldb.h"
 #include "tools/cmdline.h"
 

diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 3a915f8bea9ecca9af8d7427138bc4471322d979..9d3bd27983a11af5a449195bcb0d2a0a68a4384c 100644 (file)
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -30,7 +30,7 @@
  *
  *  Author: Andrew Tridgell
  */
-
+#include "ldb_includes.h"
 #include "ldb.h"
 #include "tools/cmdline.h"
 

diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 35d4ac70021bea0aea60dbfd05a869ba04b0f41e..ba0a2a892711dd3ee7889c28237c77dcbc4e2304 100644 (file)
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -31,6 +31,7 @@
  *  Author: Andrew Tridgell
  */
 
+#include "ldb_includes.h"
 #include "ldb.h"
 #include "tools/cmdline.h"
 

diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index edaa9fb85c0cbff2dd0fcdcafffab8acdd5e4f98..6af0ee933633c9283d4c61a18a532bdc985f12b0 100644 (file)
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -31,6 +31,7 @@
  *  Author: Andrew Tridgell
  */
 
+#include "ldb_includes.h"
 #include "ldb.h"
 #include "tools/cmdline.h"