[PATCH] Stop ldb.h including private ldb_includes.h
Sam Liddicott
sam at liddicott.com
Tue Feb 10 06:24:08 MST 2009
[I've Cc'd some of the earlier ldb authors]
ldb_includes.h is a temporary file until the ldb build system
is improved.
This is a preliminary improvement to separating ldb from samba
ldb_includes contains private includes required to build libldb
and should not be included by public ldb header files.
This patch has .c files which required ldb_includes.h to include
it directly so that ldb_includes.h does not need to be installed
with other ldb_header files.
NOTE: ldb_private.h on the other hand is a public header file
needed by externally build ldb modules.
NOTE: this is a preliminary improvement.
Probably -D_SAMBA_VERSION_=4 still needs defining so that the
ldb tools can use samba auth (-P) and other samba4 enhancements,
but ldb cannot yet be built seperately from samba4 in this manner.
Signed-off-by: Sam Liddicott <sam at liddicott.com>
---
source4/dsdb/schema/schema_set.c | 1 +
source4/lib/ldb/Makefile.in | 2 +-
source4/lib/ldb/common/attrib_handlers.c | 1 +
source4/lib/ldb/common/ldb.c | 1 +
source4/lib/ldb/common/ldb_attributes.c | 1 +
source4/lib/ldb/common/ldb_controls.c | 1 +
source4/lib/ldb/common/ldb_debug.c | 1 +
source4/lib/ldb/common/ldb_dn.c | 1 +
source4/lib/ldb/common/ldb_ldif.c | 1 +
source4/lib/ldb/common/ldb_match.c | 1 +
source4/lib/ldb/common/ldb_modules.c | 1 +
source4/lib/ldb/common/ldb_msg.c | 1 +
source4/lib/ldb/common/ldb_parse.c | 1 +
source4/lib/ldb/common/ldb_utf8.c | 1 +
source4/lib/ldb/common/qsort.c | 1 +
source4/lib/ldb/examples/ldbreader.c | 1 +
source4/lib/ldb/examples/ldifreader.c | 1 +
source4/lib/ldb/include/ldb.h | 2 +-
source4/lib/ldb/ldb_map/ldb_map.c | 1 +
source4/lib/ldb/ldb_map/ldb_map_inbound.c | 1 +
source4/lib/ldb/ldb_map/ldb_map_outbound.c | 1 +
source4/lib/ldb/ldb_tdb/ldb_cache.c | 1 +
source4/lib/ldb/ldb_tdb/ldb_index.c | 1 +
source4/lib/ldb/ldb_tdb/ldb_pack.c | 1 +
source4/lib/ldb/ldb_tdb/ldb_search.c | 1 +
source4/lib/ldb/ldb_tdb/ldb_tdb.c | 1 +
source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c | 1 +
source4/lib/ldb/modules/asq.c | 1 +
source4/lib/ldb/modules/operational.c | 1 +
source4/lib/ldb/modules/paged_results.c | 1 +
source4/lib/ldb/modules/rdn_name.c | 1 +
source4/lib/ldb/modules/sort.c | 1 +
source4/lib/ldb/pyldb.c | 1 +
source4/lib/ldb/tools/cmdline.c | 1 +
source4/lib/ldb/tools/ldbadd.c | 1 +
source4/lib/ldb/tools/ldbdel.c | 1 +
source4/lib/ldb/tools/ldbedit.c | 1 +
source4/lib/ldb/tools/ldbmodify.c | 1 +
source4/lib/ldb/tools/ldbrename.c | 1 +
source4/lib/ldb/tools/ldbsearch.c | 1 +
source4/lib/ldb/tools/ldbtest.c | 1 +
41 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/source4/dsdb/schema/schema_set.c
b/source4/dsdb/schema/schema_set.c
index d6b3e40..c723233 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -24,6 +24,7 @@
#include "dsdb/samdb/samdb.h"
#include "lib/ldb/include/ldb_module.h"
#include "param/param.h"
+#include "../lib/util/dlinklist.h"
static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct
dsdb_schema *schema, bool write_attributes)
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 7f00e8e..0bb647d 100644
--- 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_private.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/attrib_handlers.c
b/source4/lib/ldb/common/attrib_handlers.c
index 80725ec..1f5d0d0 100644
--- a/source4/lib/ldb/common/attrib_handlers.c
+++ b/source4/lib/ldb/common/attrib_handlers.c
@@ -25,6 +25,7 @@
see rfc2252
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
#include "system/locale.h"
#include "ldb_handlers.h"
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 2fb5a8f..32113e5 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -32,6 +32,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
/*
diff --git a/source4/lib/ldb/common/ldb_attributes.c
b/source4/lib/ldb/common/ldb_attributes.c
index 9fa0fb2..6b11c5d 100644
--- a/source4/lib/ldb/common/ldb_attributes.c
+++ b/source4/lib/ldb/common/ldb_attributes.c
@@ -28,6 +28,7 @@
message matching logic generic
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
#include "ldb_handlers.h"
diff --git a/source4/lib/ldb/common/ldb_controls.c
b/source4/lib/ldb/common/ldb_controls.c
index 0c587e0..c3b3591 100644
--- a/source4/lib/ldb/common/ldb_controls.c
+++ b/source4/lib/ldb/common/ldb_controls.c
@@ -31,6 +31,7 @@
* Author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
/* check if a control with the specified "oid" exist and return it */
diff --git a/source4/lib/ldb/common/ldb_debug.c
b/source4/lib/ldb/common/ldb_debug.c
index f8009eb..595f6d6 100644
--- a/source4/lib/ldb/common/ldb_debug.c
+++ b/source4/lib/ldb/common/ldb_debug.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
/*
diff --git a/source4/lib/ldb/common/ldb_dn.c
b/source4/lib/ldb/common/ldb_dn.c
index 402d629..5f14153 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -33,6 +33,7 @@
* Author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
#include <ctype.h>
diff --git a/source4/lib/ldb/common/ldb_ldif.c
b/source4/lib/ldb/common/ldb_ldif.c
index 400fb35..a37245f 100644
--- a/source4/lib/ldb/common/ldb_ldif.c
+++ b/source4/lib/ldb/common/ldb_ldif.c
@@ -35,6 +35,7 @@
see RFC2849 for the LDIF format definition
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
#include "system/locale.h"
diff --git a/source4/lib/ldb/common/ldb_match.c
b/source4/lib/ldb/common/ldb_match.c
index c622701..a8e44c3 100644
--- a/source4/lib/ldb/common/ldb_match.c
+++ b/source4/lib/ldb/common/ldb_match.c
@@ -32,6 +32,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
/*
diff --git a/source4/lib/ldb/common/ldb_modules.c
b/source4/lib/ldb/common/ldb_modules.c
index 99a4776..03ff035 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -31,6 +31,7 @@
* Author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
#if (_SAMBA_BUILD_ >= 4)
diff --git a/source4/lib/ldb/common/ldb_msg.c
b/source4/lib/ldb/common/ldb_msg.c
index ad53a3d..2fb6856 100644
--- a/source4/lib/ldb/common/ldb_msg.c
+++ b/source4/lib/ldb/common/ldb_msg.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
/*
diff --git a/source4/lib/ldb/common/ldb_parse.c
b/source4/lib/ldb/common/ldb_parse.c
index 654a635..51fcd21 100644
--- a/source4/lib/ldb/common/ldb_parse.c
+++ b/source4/lib/ldb/common/ldb_parse.c
@@ -40,6 +40,7 @@
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
#include "system/locale.h"
diff --git a/source4/lib/ldb/common/ldb_utf8.c
b/source4/lib/ldb/common/ldb_utf8.c
index 0a8a89a..6deb1d5 100644
--- a/source4/lib/ldb/common/ldb_utf8.c
+++ b/source4/lib/ldb/common/ldb_utf8.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
#include "system/locale.h"
diff --git a/source4/lib/ldb/common/qsort.c b/source4/lib/ldb/common/qsort.c
index 1a0b886..3367f64 100644
--- a/source4/lib/ldb/common/qsort.c
+++ b/source4/lib/ldb/common/qsort.c
@@ -23,6 +23,7 @@
* Simo Sorce <idra at samba.org> 2005
*/
+#include "ldb_includes.h"
#include "ldb_private.h"
/* Byte-wise swap two items of size SIZE. */
diff --git a/source4/lib/ldb/examples/ldbreader.c
b/source4/lib/ldb/examples/ldbreader.c
index 3496baf..ed89ccc 100644
--- a/source4/lib/ldb/examples/ldbreader.c
+++ b/source4/lib/ldb/examples/ldbreader.c
@@ -29,6 +29,7 @@ It lists / dumps the records in a LDB database to
standard output.
*/
+#include "ldb_includes.h"
#include "ldb.h"
/*
diff --git a/source4/lib/ldb/examples/ldifreader.c
b/source4/lib/ldb/examples/ldifreader.c
index dcd9daf..42aa333 100644
--- a/source4/lib/ldb/examples/ldifreader.c
+++ b/source4/lib/ldb/examples/ldifreader.c
@@ -29,6 +29,7 @@ It lists / dumps the entries in an LDIF file to
standard output.
*/
+#include "ldb_includes.h"
#include "ldb.h"
/*
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 6990397..fd1182e 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -46,7 +46,7 @@
#define _LDB_H_ 1
/*! \endcond */
-#include "ldb_includes.h"
+#include "ldb_errors.h"
/*
major restrictions as compared to normal LDAP:
diff --git a/source4/lib/ldb/ldb_map/ldb_map.c
b/source4/lib/ldb/ldb_map/ldb_map.c
index ea2bfd1..5b02e00 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -35,6 +35,7 @@
* Author: Jelmer Vernooij, Martin Kuehl
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
#include "ldb_map.h"
diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
index e915a5f..cfc66d6 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
@@ -24,6 +24,7 @@
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
#include "ldb_map.h"
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index 327fa92..2968a79 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -25,6 +25,7 @@
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
#include "ldb_map.h"
diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c
b/source4/lib/ldb/ldb_tdb/ldb_cache.c
index 43b965f..4baea19 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_tdb.h"
#define LTDB_FLAG_CASE_INSENSITIVE (1<<0)
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c
b/source4/lib/ldb/ldb_tdb/ldb_index.c
index cdbef39..72608b2 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_tdb.h"
/*
diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c
b/source4/lib/ldb/ldb_tdb/ldb_pack.c
index 1995606..463772d 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_pack.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_tdb.h"
/* change this if the data format ever changes */
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c
b/source4/lib/ldb/ldb_tdb/ldb_search.c
index 0f59526..492543a 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb_tdb.h"
/*
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index d6276c4..91db3cb 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -45,6 +45,7 @@
* Author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_tdb.h"
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index 6ee8417..6706b52 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
@@ -21,6 +21,7 @@
License along with this library; if not, see
<http://www.gnu.org/licenses/>.
*/
+#include "ldb_includes.h"
#include "ldb_tdb.h"
/*
diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c
index 475b609..d6a7aa4 100644
--- a/source4/lib/ldb/modules/asq.c
+++ b/source4/lib/ldb/modules/asq.c
@@ -32,6 +32,7 @@
* Author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
struct asq_context {
diff --git a/source4/lib/ldb/modules/operational.c
b/source4/lib/ldb/modules/operational.c
index d862638..818e633 100644
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -73,6 +73,7 @@
modifiersName: not supported by w2k3?
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
/*
diff --git a/source4/lib/ldb/modules/paged_results.c
b/source4/lib/ldb/modules/paged_results.c
index 7d7cdf6..2a06c5e 100644
--- 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 a5ffcc0..880678d 100644
--- 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/modules/sort.c b/source4/lib/ldb/modules/sort.c
index 2b2a1ab..8b6b712 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -31,6 +31,7 @@
* Author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
struct opaque {
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index ef2af06..2b03e29 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -26,6 +26,7 @@
*/
#include "replace.h"
+#include "ldb_includes.h"
#include "ldb_private.h"
#include <Python.h>
#include "pyldb.h"
diff --git a/source4/lib/ldb/tools/cmdline.c
b/source4/lib/ldb/tools/cmdline.c
index 3dce9b1..2701de5 100644
--- 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/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index be02334..74d9168 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.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/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 232f516..5a258c5 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.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/ldbedit.c
b/source4/lib/ldb/tools/ldbedit.c
index 3a915f8..44a131f 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.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/ldbmodify.c
b/source4/lib/ldb/tools/ldbmodify.c
index c3f55c6..8c1947a 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.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/ldbrename.c
b/source4/lib/ldb/tools/ldbrename.c
index 01ed3d9..d820569 100644
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -33,6 +33,7 @@
* Author: Stefan Metzmacher
*/
+#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 35d4ac7..ba0a2a8 100644
--- 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 edaa9fb..6af0ee9 100644
--- 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"
More information about the samba-technical
mailing list