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/samdb/cracknames.c | 4 ++-- source4/dsdb/samdb/ldb_modules/extended_dn_in.c | 6 +++--- source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 6 +++--- source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 6 +++--- source4/dsdb/samdb/ldb_modules/partition.h | 6 +++--- source4/dsdb/samdb/ldb_modules/rootdse.c | 4 ++-- source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 6 +++--- source4/dsdb/samdb/ldb_modules/samba_secrets.c | 6 +++--- source4/dsdb/samdb/ldb_modules/schema_util.c | 2 +- source4/dsdb/samdb/ldb_modules/show_deleted.c | 2 +- source4/dsdb/samdb/ldb_modules/simple_ldap_map.c | 2 +- source4/dsdb/samdb/samdb.c | 4 ++-- source4/dsdb/samdb/samdb.h | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) (limited to 'source4/dsdb/samdb') diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index 1964e134f0..d9224828ca 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -25,8 +25,8 @@ #include "librpc/gen_ndr/drsuapi.h" #include "lib/events/events.h" #include "rpc_server/common/common.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include +#include #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" #include "libcli/ldap/ldap_ndr.h" diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c index c39953f418..3e2004d6f3 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c @@ -30,9 +30,9 @@ */ #include "includes.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" -#include "ldb/include/ldb_module.h" +#include +#include +#include /* TODO: if relax is not set then we need to reject the fancy RMD_* and diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c index e59bd84168..4f6033ccc2 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c @@ -32,9 +32,9 @@ */ #include "includes.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" -#include "ldb/include/ldb_module.h" +#include +#include +#include #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c index e38a45194b..b4f71e9319 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c @@ -36,9 +36,9 @@ */ #include "includes.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" -#include "ldb/include/ldb_module.h" +#include +#include +#include #include "librpc/gen_ndr/ndr_misc.h" #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" diff --git a/source4/dsdb/samdb/ldb_modules/partition.h b/source4/dsdb/samdb/ldb_modules/partition.h index 3b67d30217..45568ba404 100644 --- a/source4/dsdb/samdb/ldb_modules/partition.h +++ b/source4/dsdb/samdb/ldb_modules/partition.h @@ -18,9 +18,9 @@ along with this program. If not, see . */ #include "includes.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb/include/ldb_module.h" +#include +#include +#include #include "dsdb/samdb/samdb.h" #include "dsdb/samdb/ldb_modules/util.h" #include "system/locale.h" diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index c5486b539b..98889125f3 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -21,8 +21,8 @@ */ #include "includes.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_module.h" +#include +#include #include "system/time.h" #include "dsdb/samdb/samdb.h" #include "version.h" diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c index bc5784e5ac..35b323b72f 100644 --- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c +++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c @@ -31,9 +31,9 @@ */ #include "includes.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb/include/ldb_module.h" +#include +#include +#include #include "dsdb/samdb/ldb_modules/util.h" #include "dsdb/samdb/samdb.h" #include "librpc/ndr/libndr.h" diff --git a/source4/dsdb/samdb/ldb_modules/samba_secrets.c b/source4/dsdb/samdb/ldb_modules/samba_secrets.c index 65ed237506..1eaf00af0d 100644 --- a/source4/dsdb/samdb/ldb_modules/samba_secrets.c +++ b/source4/dsdb/samdb/ldb_modules/samba_secrets.c @@ -30,9 +30,9 @@ */ #include "includes.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb/include/ldb_module.h" +#include +#include +#include #include "dsdb/samdb/ldb_modules/util.h" #include "dsdb/samdb/samdb.h" diff --git a/source4/dsdb/samdb/ldb_modules/schema_util.c b/source4/dsdb/samdb/ldb_modules/schema_util.c index e115104a40..86c21f02c6 100644 --- a/source4/dsdb/samdb/ldb_modules/schema_util.c +++ b/source4/dsdb/samdb/ldb_modules/schema_util.c @@ -25,7 +25,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/samdb/ldb_modules/show_deleted.c b/source4/dsdb/samdb/ldb_modules/show_deleted.c index 25e4630331..bef4c06090 100644 --- a/source4/dsdb/samdb/ldb_modules/show_deleted.c +++ b/source4/dsdb/samdb/ldb_modules/show_deleted.c @@ -32,7 +32,7 @@ */ #include "includes.h" -#include "ldb/include/ldb_module.h" +#include #include "dsdb/samdb/samdb.h" #include "dsdb/samdb/ldb_modules/util.h" diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c index ccd47dc3ca..fce4592895 100644 --- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c +++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c @@ -27,7 +27,7 @@ */ #include "includes.h" -#include "ldb/include/ldb_module.h" +#include #include "ldb/ldb_map/ldb_map.h" #include "librpc/gen_ndr/ndr_misc.h" diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index 53be12cd52..29b454467c 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -26,8 +26,8 @@ #include "librpc/gen_ndr/ndr_security.h" #include "lib/events/events.h" #include "lib/ldb-samba/ldb_wrap.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include +#include #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" #include "libcli/ldap/ldap_ndr.h" diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 7748bcd78c..8efb5e0af2 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -30,7 +30,7 @@ struct loadparm_context; struct tevent_context; #include "librpc/gen_ndr/security.h" -#include "lib/ldb/include/ldb.h" +#include #include "lib/ldb-samba/ldif_handlers.h" #include "librpc/gen_ndr/samr.h" #include "librpc/gen_ndr/drsuapi.h" -- cgit