diff options
author | Andrew Tridgell <tridge@samba.org> | 2011-02-10 14:12:51 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2011-02-10 06:51:07 +0100 |
commit | 8dc92c8f71311e95a3a3c297b32ed46477228f56 (patch) | |
tree | 227e9e372d6939f1d403b3253e47d3abf997035a /source4/dsdb | |
parent | e26b1a69689c8123bddf33830e9659d460815531 (diff) | |
download | samba-8dc92c8f71311e95a3a3c297b32ed46477228f56.tar.gz samba-8dc92c8f71311e95a3a3c297b32ed46477228f56.tar.bz2 samba-8dc92c8f71311e95a3a3c297b32ed46477228f56.zip |
ldb: use #include <ldb.h> 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 <abartlet@samba.org>
Diffstat (limited to 'source4/dsdb')
34 files changed, 53 insertions, 53 deletions
diff --git a/source4/dsdb/common/dsdb_dn.c b/source4/dsdb/common/dsdb_dn.c index 3e0f4653fd..b53de409fe 100644 --- a/source4/dsdb/common/dsdb_dn.c +++ b/source4/dsdb/common/dsdb_dn.c @@ -21,7 +21,7 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" -#include "lib/ldb/include/ldb_module.h" +#include <ldb_module.h> #include "librpc/ndr/libndr.h" #include "libcli/security/dom_sid.h" diff --git a/source4/dsdb/common/tests/dsdb_dn.c b/source4/dsdb/common/tests/dsdb_dn.c index bad649cde8..9ae0c8a049 100644 --- a/source4/dsdb/common/tests/dsdb_dn.c +++ b/source4/dsdb/common/tests/dsdb_dn.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 <ldb.h> +#include <ldb_errors.h> #include "lib/ldb-samba/ldif_handlers.h" #include "ldb_wrap.h" #include "dsdb/samdb/samdb.h" diff --git a/source4/dsdb/kcc/kcc_connection.c b/source4/dsdb/kcc/kcc_connection.c index 48c63255a1..3c30909028 100644 --- a/source4/dsdb/kcc/kcc_connection.c +++ b/source4/dsdb/kcc/kcc_connection.c @@ -27,7 +27,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/kcc/kcc_service.h" #include "dsdb/kcc/kcc_connection.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/kcc/kcc_deleted.c b/source4/dsdb/kcc/kcc_deleted.c index 3ff4a0a3fd..35f538de0c 100644 --- a/source4/dsdb/kcc/kcc_deleted.c +++ b/source4/dsdb/kcc/kcc_deleted.c @@ -28,7 +28,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/kcc/kcc_connection.h" #include "dsdb/kcc/kcc_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c index 1da3ecd00d..2629114afc 100644 --- a/source4/dsdb/kcc/kcc_drs_replica_info.c +++ b/source4/dsdb/kcc/kcc_drs_replica_info.c @@ -28,7 +28,7 @@ #include "lib/events/events.h" #include "lib/messaging/irpc.h" #include "dsdb/kcc/kcc_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c index e0ac2c7786..7f4f5576d3 100644 --- a/source4/dsdb/kcc/kcc_periodic.c +++ b/source4/dsdb/kcc/kcc_periodic.c @@ -28,7 +28,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/kcc/kcc_connection.h" #include "dsdb/kcc/kcc_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c index 0205cbe0e0..b2360d81cd 100644 --- a/source4/dsdb/kcc/kcc_service.c +++ b/source4/dsdb/kcc/kcc_service.c @@ -28,7 +28,7 @@ #include "lib/events/events.h" #include "lib/messaging/irpc.h" #include "dsdb/kcc/kcc_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c index 44a50ed6d3..58081d4e11 100644 --- a/source4/dsdb/repl/drepl_notify.c +++ b/source4/dsdb/repl/drepl_notify.c @@ -27,7 +27,7 @@ #include "auth/auth.h" #include "smbd/service.h" #include "dsdb/repl/drepl_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index c46134e9e8..893eb3bbcd 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -25,7 +25,7 @@ #include "smbd/service.h" #include "lib/events/events.h" #include "dsdb/repl/drepl_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c index c62a605dcc..11165f4a3e 100644 --- a/source4/dsdb/repl/drepl_out_pull.c +++ b/source4/dsdb/repl/drepl_out_pull.c @@ -25,7 +25,7 @@ #include "smbd/service.h" #include "lib/events/events.h" #include "dsdb/repl/drepl_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c index 4033c97908..470a88f76d 100644 --- a/source4/dsdb/repl/drepl_partitions.c +++ b/source4/dsdb/repl/drepl_partitions.c @@ -25,7 +25,7 @@ #include "smbd/service.h" #include "lib/events/events.h" #include "dsdb/repl/drepl_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c index becbca7b11..4487bb025f 100644 --- a/source4/dsdb/repl/drepl_periodic.c +++ b/source4/dsdb/repl/drepl_periodic.c @@ -25,7 +25,7 @@ #include "auth/auth.h" #include "smbd/service.h" #include "dsdb/repl/drepl_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c index a85750b3c1..ab97ba650d 100644 --- a/source4/dsdb/repl/drepl_service.c +++ b/source4/dsdb/repl/drepl_service.c @@ -26,7 +26,7 @@ #include "smbd/service.h" #include "lib/events/events.h" #include "dsdb/repl/drepl_service.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 0def815c5f..bbfcfd8660 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -21,7 +21,7 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" 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 <ldb.h> +#include <ldb_errors.h> #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 <ldb.h> +#include <ldb_errors.h> +#include <ldb_module.h> /* 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 <ldb.h> +#include <ldb_errors.h> +#include <ldb_module.h> #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 <ldb.h> +#include <ldb_errors.h> +#include <ldb_module.h> #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 <http://www.gnu.org/licenses/>. */ #include "includes.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb/include/ldb_module.h" +#include <ldb.h> +#include <ldb_errors.h> +#include <ldb_module.h> #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 <ldb.h> +#include <ldb_module.h> #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 <ldb.h> +#include <ldb_errors.h> +#include <ldb_module.h> #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 <ldb.h> +#include <ldb_errors.h> +#include <ldb_module.h> #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 <ldb_module.h> #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 <ldb_module.h> #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 <ldb_module.h> #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 <ldb.h> +#include <ldb_errors.h> #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 <ldb.h> #include "lib/ldb-samba/ldif_handlers.h" #include "librpc/gen_ndr/samr.h" #include "librpc/gen_ndr/drsuapi.h" 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 <ldb_module.h> #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 <ldb_errors.h> #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 <ldb_module.h> #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 <ldb_errors.h> #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 <ldb_module.h> #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 <ldb_module.h> #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 <ldb.h> +#include <ldb_errors.h> #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 <ldb.h> +#include <ldb_errors.h> #include "lib/ldb-samba/ldif_handlers.h" #include "ldb_wrap.h" #include "dsdb/samdb/samdb.h" |