diff options
81 files changed, 124 insertions, 124 deletions
diff --git a/lib/util/util_ldb.c b/lib/util/util_ldb.c index a92824597a..25ae510689 100644 --- a/lib/util/util_ldb.c +++ b/lib/util/util_ldb.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "../lib/util/util_ldb.h" /* diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h index 3354fadb92..94eaed2f96 100644 --- a/libcli/ldap/ldap_message.h +++ b/libcli/ldap/ldap_message.h @@ -25,7 +25,7 @@ #if _SAMBA_BUILD_ == 3 #include "lib/ldb_compat.h" #else -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #endif enum ldap_request_tag { diff --git a/libcli/ldap/ldap_ndr.c b/libcli/ldap/ldap_ndr.c index 6daaba3604..f77a6f2c3d 100644 --- a/libcli/ldap/ldap_ndr.c +++ b/libcli/ldap/ldap_ndr.c @@ -24,7 +24,7 @@ #if _SAMBA_BUILD_ == 3 #include "lib/ldb_compat.h" #else -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #endif #include "librpc/gen_ndr/ndr_security.h" #include "librpc/gen_ndr/ndr_misc.h" diff --git a/source4/auth/credentials/credentials_secrets.c b/source4/auth/credentials/credentials_secrets.c index 210590caff..0be4680e34 100644 --- a/source4/auth/credentials/credentials_secrets.c +++ b/source4/auth/credentials/credentials_secrets.c @@ -23,7 +23,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */ #include "param/secrets.h" #include "system/filesys.h" diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index ed0597ca98..307a507d6d 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -27,7 +27,7 @@ #include "auth/kerberos/kerberos.h" #include "librpc/gen_ndr/krb5pac.h" #include "auth/auth.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "auth/auth_sam.h" #include "librpc/rpc/dcerpc.h" #include "auth/credentials/credentials.h" diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c index 9620a80d02..07f936ad2e 100644 --- a/source4/auth/kerberos/kerberos_pac.c +++ b/source4/auth/kerberos/kerberos_pac.c @@ -28,7 +28,7 @@ #include "auth/auth.h" #include "auth/kerberos/kerberos.h" #include "librpc/gen_ndr/ndr_krb5pac.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "auth/auth_sam_reply.h" krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c index ef4932e87c..f9765ff1b9 100644 --- a/source4/auth/ntlm/auth_sam.c +++ b/source4/auth/ntlm/auth_sam.c @@ -21,7 +21,7 @@ #include "includes.h" #include "system/time.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "libcli/ldap/ldap_ndr.h" #include "libcli/security/security.h" #include "auth/auth.h" diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index 8b396845ae..5dbf9c99be 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -27,8 +27,8 @@ #include "cldap_server/cldap_server.h" #include "system/network.h" #include "lib/socket/netif.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "dsdb/samdb/samdb.h" #include "ldb_wrap.h" #include "auth/auth.h" diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index 7192e4601f..4d3ef48a79 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -21,8 +21,8 @@ */ #include "includes.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "lib/events/events.h" #include "smbd/service_task.h" #include "cldap_server/cldap_server.h" diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c index 59f30bc3e5..b8956169d2 100644 --- a/source4/cldap_server/rootdse.c +++ b/source4/cldap_server/rootdse.c @@ -21,8 +21,8 @@ #include "includes.h" #include <tevent.h> -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "smbd/service_task.h" #include "cldap_server/cldap_server.h" #include "librpc/gen_ndr/ndr_misc.h" 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" diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index 18d29a10cb..52769493da 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -23,7 +23,7 @@ #include "includes.h" #include "../libds/common/flags.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "auth/auth.h" #include "auth/auth_sam_reply.h" #include "kdc/kdc-glue.h" diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c index f3c9b01b7e..e96caa6b07 100644 --- a/source4/ldap_server/ldap_backend.c +++ b/source4/ldap_server/ldap_backend.c @@ -26,8 +26,8 @@ #include "param/param.h" #include "smbd/service_stream.h" #include "dsdb/samdb/samdb.h" -#include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb/include/ldb_module.h" +#include <ldb_errors.h> +#include <ldb_module.h> #include "ldb_wrap.h" #define VALID_DN_SYNTAX(dn) do {\ diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c index 92afb800e0..0f3d0631d0 100644 --- a/source4/ldap_server/ldap_bind.c +++ b/source4/ldap_server/ldap_bind.c @@ -21,8 +21,8 @@ #include "ldap_server/ldap_server.h" #include "auth/auth.h" #include "smbd/service.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "dsdb/samdb/samdb.h" #include "auth/gensec/gensec.h" #include "auth/gensec/gensec_tstream.h" diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 4547759a37..cd90b47b45 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -36,8 +36,8 @@ #include "smbd/process_model.h" #include "lib/tls/tls.h" #include "lib/messaging/irpc.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "libcli/ldap/ldap_proto.h" #include "system/network.h" #include "lib/socket/netif.h" diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c index 763e785f92..e3e6dcecfa 100644 --- a/source4/lib/ldb-samba/ldb_wrap.c +++ b/source4/lib/ldb-samba/ldb_wrap.c @@ -28,8 +28,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/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c index 58dda5713b..af3c4b46e1 100644 --- a/source4/lib/ldb-samba/ldif_handlers.c +++ b/source4/lib/ldb-samba/ldif_handlers.c @@ -23,8 +23,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 "ldb_handlers.h" #include "dsdb/samdb/samdb.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/lib/policy/gp_ldap.c b/source4/lib/policy/gp_ldap.c index 271188353c..091af2ee16 100644 --- a/source4/lib/policy/gp_ldap.c +++ b/source4/lib/policy/gp_ldap.c @@ -19,7 +19,7 @@ */ #include "includes.h" #include "param/param.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "lib/ldb-samba/ldb_wrap.h" #include "auth/credentials/credentials.h" #include "../librpc/gen_ndr/nbt.h" diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c index 09f39f6f30..a6f00aa330 100644 --- a/source4/lib/registry/ldb.c +++ b/source4/lib/registry/ldb.c @@ -20,8 +20,8 @@ #include "includes.h" #include "registry.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "ldb_wrap.h" #include "librpc/gen_ndr/winreg.h" #include "param/param.h" diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h index 7492b7337a..4e55ed05f5 100644 --- a/source4/libnet/libnet.h +++ b/source4/libnet/libnet.h @@ -60,7 +60,7 @@ struct libnet_context { }; -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "libnet/composite.h" #include "libnet/userman.h" #include "libnet/userinfo.h" diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index e1545e8d3c..29ee069dd3 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -21,8 +21,8 @@ #include "libnet/libnet.h" #include "libcli/composite/composite.h" #include "libcli/cldap/cldap.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "ldb_wrap.h" #include "dsdb/samdb/samdb.h" #include "../libds/common/flags.h" diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 1b485e7724..715f21b989 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -22,8 +22,8 @@ #include "includes.h" #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "dsdb/samdb/samdb.h" #include "ldb_wrap.h" #include "libcli/security/security.h" diff --git a/source4/libnet/libnet_site.c b/source4/libnet/libnet_site.c index e4f037d0b8..5332b047e5 100644 --- a/source4/libnet/libnet_site.c +++ b/source4/libnet/libnet_site.c @@ -20,8 +20,8 @@ #include "includes.h" #include "libnet/libnet.h" #include "libcli/cldap/cldap.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "libcli/resolve/resolve.h" #include "param/param.h" #include "lib/tsocket/tsocket.h" diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index bc96c4ac3e..67227de13b 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -21,8 +21,8 @@ #include "libnet/libnet.h" #include "libcli/composite/composite.h" #include "libcli/cldap/cldap.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "ldb_wrap.h" #include "dsdb/samdb/samdb.h" #include "../libds/common/flags.h" diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 40cf01ed52..91a11eec67 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -27,8 +27,8 @@ #include "lib/events/events.h" #include "dsdb/samdb/samdb.h" #include "../lib/util/dlinklist.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "librpc/ndr/libndr.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index 81ee4c60ea..a727c69d52 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -23,7 +23,7 @@ #include "includes.h" #include "nbt_server/nbt_server.h" #include "lib/socket/socket.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "param/param.h" diff --git a/source4/nbt_server/wins/wins_ldb.c b/source4/nbt_server/wins/wins_ldb.c index 33c10581c3..0896e1d74e 100644 --- a/source4/nbt_server/wins/wins_ldb.c +++ b/source4/nbt_server/wins/wins_ldb.c @@ -31,7 +31,7 @@ #include "lib/events/events.h" #include "nbt_server/nbt_server.h" #include "nbt_server/wins/winsdb.h" -#include "lib/ldb/include/ldb_module.h" +#include <ldb_module.h> #include "system/network.h" #include "lib/socket/netif.h" #include "param/param.h" diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c index 9ed4d0ac0a..791ce957c7 100644 --- a/source4/nbt_server/wins/winsdb.c +++ b/source4/nbt_server/wins/winsdb.c @@ -23,8 +23,8 @@ #include "includes.h" #include "nbt_server/nbt_server.h" #include "nbt_server/wins/winsdb.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "librpc/gen_ndr/ndr_nbt.h" #include "system/time.h" #include "ldb_wrap.h" diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c index 516258e892..1e6a0cfca8 100644 --- a/source4/nbt_server/wins/winsserver.c +++ b/source4/nbt_server/wins/winsserver.c @@ -32,7 +32,7 @@ #include "system/network.h" #include "lib/socket/socket.h" #include "lib/socket/netif.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "param/param.h" #include "libcli/resolve/resolve.h" #include "lib/util/util_net.h" diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c index 71b9a9dbc2..969d698a16 100644 --- a/source4/ntp_signd/ntp_signd.c +++ b/source4/ntp_signd/ntp_signd.c @@ -35,8 +35,8 @@ #include "auth/auth.h" #include "libcli/security/security.h" #include "libcli/ldap/ldap_ndr.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "../lib/crypto/md5.h" #include "system/network.h" #include "system/passwd.h" diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c index 641f5d3959..5849df9c04 100644 --- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c +++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c @@ -30,7 +30,7 @@ #include "includes.h" #include "ntptr/ntptr.h" #include "librpc/gen_ndr/ndr_spoolss.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "auth/auth.h" #include "dsdb/samdb/samdb.h" #include "ldb_wrap.h" diff --git a/source4/param/secrets.c b/source4/param/secrets.c index d87264a960..13bfcc5e96 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -27,7 +27,7 @@ #include "system/filesys.h" #include "tdb_wrap.h" #include "lib/ldb-samba/ldb_wrap.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "../lib/util/util_tdb.h" #include "librpc/gen_ndr/ndr_security.h" #include "dsdb/samdb/samdb.h" diff --git a/source4/param/share_ldb.c b/source4/param/share_ldb.c index 4517661c66..28e145d7db 100644 --- a/source4/param/share_ldb.c +++ b/source4/param/share_ldb.c @@ -20,8 +20,8 @@ */ #include "includes.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "auth/auth.h" #include "ldb_wrap.h" #include "param/share.h" diff --git a/source4/rpc_server/lsa/lsa.h b/source4/rpc_server/lsa/lsa.h index 53fe102630..dc0c7d6795 100644 --- a/source4/rpc_server/lsa/lsa.h +++ b/source4/rpc_server/lsa/lsa.h @@ -26,7 +26,7 @@ #include "auth/auth.h" #include "dsdb/samdb/samdb.h" #include "libcli/ldap/ldap_ndr.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb_errors.h> #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" #include "param/secrets.h" diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 8b53aef3ef..c2b0d03f1e 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -28,8 +28,8 @@ #include "rpc_server/common/common.h" #include "rpc_server/samr/dcesrv_samr.h" #include "system/time.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "../libds/common/flags.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" diff --git a/source4/samba_tool/gpo.c b/source4/samba_tool/gpo.c index 46243a07b6..10c231c85a 100644 --- a/source4/samba_tool/gpo.c +++ b/source4/samba_tool/gpo.c @@ -23,7 +23,7 @@ #include "includes.h" #include "samba_tool/samba_tool.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "auth/auth.h" #include "param/param.h" #include "libcli/security/sddl.h" diff --git a/source4/samba_tool/samba_tool.c b/source4/samba_tool/samba_tool.c index 411eb6d98d..8dfbb83298 100644 --- a/source4/samba_tool/samba_tool.c +++ b/source4/samba_tool/samba_tool.c @@ -45,7 +45,7 @@ #include "includes.h" #include "samba_tool/samba_tool.h" #include "lib/cmdline/popt_common.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "librpc/rpc/dcerpc.h" #include "param/param.h" #include "lib/events/events.h" diff --git a/source4/torture/drs/unit/schemainfo_tests.c b/source4/torture/drs/unit/schemainfo_tests.c index 3db7c8cdc9..95469d9130 100644 --- a/source4/torture/drs/unit/schemainfo_tests.c +++ b/source4/torture/drs/unit/schemainfo_tests.c @@ -25,7 +25,7 @@ #include "dsdb/samdb/samdb.h" #include "dsdb/samdb/ldb_modules/util.h" #include "ldb_wrap.h" -#include "lib/ldb/include/ldb_module.h" +#include <ldb_module.h> #include "torture/rpc/drsuapi.h" #include "librpc/ndr/libndr.h" #include "param/param.h" diff --git a/source4/torture/ldap/ldap_sort.c b/source4/torture/ldap/ldap_sort.c index aab590fd3d..c0fa41aab8 100644 --- a/source4/torture/ldap/ldap_sort.c +++ b/source4/torture/ldap/ldap_sort.c @@ -22,8 +22,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 "ldb_wrap.h" #include "param/param.h" #include "lib/cmdline/popt_common.h" diff --git a/source4/torture/ldb/ldb.c b/source4/torture/ldb/ldb.c index 23f060b9b1..fbf82d889b 100644 --- a/source4/torture/ldb/ldb.c +++ b/source4/torture/ldb/ldb.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/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index 45c4341bc6..9d7c551db6 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -22,8 +22,8 @@ #include "includes.h" #include "system/filesys.h" #include "../tdb/include/tdb.h" -#include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "ldb_wrap.h" #include "lib/tdb_wrap.h" #include "torture/smbtorture.h" diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index 259f997b47..80db95cc6b 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -24,7 +24,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" #include "torture/rpc/torture_rpc.h" -#include "ldb/include/ldb.h" +#include <ldb.h> #include "libcli/security/security.h" struct DsCrackNamesPrivate { diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 14052e7a0b..30c42c0f4e 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -32,7 +32,7 @@ #include "librpc/gen_ndr/ndr_lsa_c.h" #include "param/param.h" #include "libcli/security/security.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "lib/util/util_ldb.h" #include "ldb_wrap.h" #include "lib/replace/system/network.h" diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index 9c73d3c79e..2c38416b43 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -24,7 +24,7 @@ #include "includes.h" #include "system/filesys.h" #include "lib/cmdline/popt_common.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" #include "auth/auth.h" diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c index 832633114f..ff57064d48 100644 --- a/source4/winbind/idmap.c +++ b/source4/winbind/idmap.c @@ -22,7 +22,7 @@ #include "includes.h" #include "auth/auth.h" #include "librpc/gen_ndr/ndr_security.h" -#include "lib/ldb/include/ldb.h" +#include <ldb.h> #include "ldb_wrap.h" #include "param/param.h" #include "winbind/idmap.h" diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c index aee6e4920f..e34922e270 100644 --- a/source4/wrepl_server/wrepl_in_call.c +++ b/source4/wrepl_server/wrepl_in_call.c @@ -28,8 +28,8 @@ #include "wrepl_server/wrepl_server.h" #include "libcli/composite/composite.h" #include "nbt_server/wins/winsdb.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/tsort.h" #include "param/param.h" diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c index 68af6793bf..18d4780c0b 100644 --- a/source4/wrepl_server/wrepl_scavenging.c +++ b/source4/wrepl_server/wrepl_scavenging.c @@ -23,8 +23,8 @@ #include "librpc/gen_ndr/ndr_winsrepl.h" #include "wrepl_server/wrepl_server.h" #include "nbt_server/wins/winsdb.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "system/time.h" #include "smbd/service_task.h" #include "lib/messaging/irpc.h" diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index af89d8a9f9..83510c73a8 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -27,8 +27,8 @@ #include "librpc/gen_ndr/winsrepl.h" #include "wrepl_server/wrepl_server.h" #include "nbt_server/wins/winsdb.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" +#include <ldb.h> +#include <ldb_errors.h> #include "auth/auth.h" #include "ldb_wrap.h" #include "param/param.h" |