From 8dc92c8f71311e95a3a3c297b32ed46477228f56 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Feb 2011 14:12:51 +1100 Subject: ldb: use #include for ldb thi ensures we are using the header corresponding to the version of ldb we're linking against. Otherwise we could use the system ldb for link and the in-tree one for include Pair-Programmed-With: Andrew Bartlett --- source4/dsdb/schema/dsdb_dn.c | 2 +- source4/dsdb/schema/schema_filtered.c | 2 +- source4/dsdb/schema/schema_info_attr.c | 2 +- source4/dsdb/schema/schema_init.c | 4 ++-- source4/dsdb/schema/schema_set.c | 2 +- source4/dsdb/schema/schema_syntax.c | 4 ++-- source4/dsdb/schema/tests/schema_syntax.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/dsdb/schema') diff --git a/source4/dsdb/schema/dsdb_dn.c b/source4/dsdb/schema/dsdb_dn.c index bd945bca06..06565a985a 100644 --- a/source4/dsdb/schema/dsdb_dn.c +++ b/source4/dsdb/schema/dsdb_dn.c @@ -21,7 +21,7 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" -#include "lib/ldb/include/ldb_module.h" +#include #include "librpc/ndr/libndr.h" #include "libcli/security/dom_sid.h" diff --git a/source4/dsdb/schema/schema_filtered.c b/source4/dsdb/schema/schema_filtered.c index 80c0ebd1ea..814f4ebd5b 100644 --- a/source4/dsdb/schema/schema_filtered.c +++ b/source4/dsdb/schema/schema_filtered.c @@ -21,7 +21,7 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" -#include "lib/ldb/include/ldb_errors.h" +#include #include "../lib/util/dlinklist.h" #include "param/param.h" diff --git a/source4/dsdb/schema/schema_info_attr.c b/source4/dsdb/schema/schema_info_attr.c index 31658e210b..e113033a52 100644 --- a/source4/dsdb/schema/schema_info_attr.c +++ b/source4/dsdb/schema/schema_info_attr.c @@ -23,7 +23,7 @@ #include "dsdb/common/util.h" #include "dsdb/samdb/samdb.h" #include "dsdb/samdb/ldb_modules/util.h" -#include "lib/ldb/include/ldb_module.h" +#include #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" #include "param/param.h" diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c index 62111c5ed8..df6da65cca 100644 --- a/source4/dsdb/schema/schema_init.c +++ b/source4/dsdb/schema/schema_init.c @@ -23,13 +23,13 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" -#include "lib/ldb/include/ldb_errors.h" +#include #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" #include "param/param.h" -#include "lib/ldb/include/ldb_module.h" +#include #include "../lib/util/asn1.h" diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c index 004d7eb3a3..1ed76c6bb9 100644 --- a/source4/dsdb/schema/schema_set.c +++ b/source4/dsdb/schema/schema_set.c @@ -23,7 +23,7 @@ #include "includes.h" #include "lib/util/dlinklist.h" #include "dsdb/samdb/samdb.h" -#include "lib/ldb/include/ldb_module.h" +#include #include "param/param.h" #include "librpc/ndr/libndr.h" #include "librpc/gen_ndr/ndr_misc.h" diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 715f219530..6d2700599d 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -25,8 +25,8 @@ #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_security.h" #include "librpc/gen_ndr/ndr_misc.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include +#include #include "system/time.h" #include "../lib/util/charset/charset.h" #include "librpc/ndr/libndr.h" diff --git a/source4/dsdb/schema/tests/schema_syntax.c b/source4/dsdb/schema/tests/schema_syntax.c index 326c94ff5a..fed7063577 100644 --- a/source4/dsdb/schema/tests/schema_syntax.c +++ b/source4/dsdb/schema/tests/schema_syntax.c @@ -21,8 +21,8 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include +#include #include "lib/ldb-samba/ldif_handlers.h" #include "ldb_wrap.h" #include "dsdb/samdb/samdb.h" -- cgit