diff options
142 files changed, 151 insertions, 151 deletions
diff --git a/lib/util/asn1.c b/lib/util/asn1.c index 4756c0640df..ef346542a64 100644 --- a/lib/util/asn1.c +++ b/lib/util/asn1.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/util/asn1.h" +#include "../lib/util/asn1.h" /* allocate an asn1 structure */ struct asn1_data *asn1_init(TALLOC_CTX *mem_ctx) diff --git a/lib/util/asn1.h b/lib/util/asn1.h index 34aa1e2cb9c..c8e83b92668 100644 --- a/lib/util/asn1.h +++ b/lib/util/asn1.h @@ -49,6 +49,6 @@ struct asn1_data { #define ASN1_MAX_OIDS 20 -#include "lib/util/asn1_proto.h" +#include "../lib/util/asn1_proto.h" #endif /* _ASN_1_H */ diff --git a/lib/util/util_ldb.c b/lib/util/util_ldb.c index 0465022edd6..70b18478c65 100644 --- a/lib/util/util_ldb.c +++ b/lib/util/util_ldb.c @@ -24,7 +24,7 @@ #include "lib/events/events.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/util_ldb.h" +#include "../lib/util/util_ldb.h" /* search the sam for the specified attributes - va_list variant */ diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c index e89085a31bd..96fda5e86a7 100644 --- a/lib/util/util_tdb.c +++ b/lib/util/util_tdb.c @@ -22,7 +22,7 @@ #include "includes.h" #include "../tdb/include/tdb.h" #include "pstring.h" -#include "lib/util/util_tdb.h" +#include "../lib/util/util_tdb.h" /* these are little tdb utility functions that are meant to make dealing with a tdb database a little less cumbersome in Samba */ diff --git a/lib/util/wrap_xattr.c b/lib/util/wrap_xattr.c index 955f39a7ebb..b7e69c36766 100644 --- a/lib/util/wrap_xattr.c +++ b/lib/util/wrap_xattr.c @@ -21,7 +21,7 @@ #include "includes.h" #include "system/filesys.h" -#include "lib/util/wrap_xattr.h" +#include "../lib/util/wrap_xattr.h" #if defined(HAVE_XATTR_SUPPORT) && defined(XATTR_ADDITIONAL_OPTIONS) static ssize_t _wrap_darwin_fgetxattr(int fd, const char *name, void *value, size_t size) diff --git a/libcli/nbt/nbtsocket.c b/libcli/nbt/nbtsocket.c index 57531d2e7b4..520e9d978a0 100644 --- a/libcli/nbt/nbtsocket.c +++ b/libcli/nbt/nbtsocket.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "../libcli/nbt/libnbt.h" #include "lib/socket/socket.h" #include "librpc/gen_ndr/ndr_nbt.h" diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index 6c3bb2531ea..364e80a3a6d 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -27,7 +27,7 @@ #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */ #include "param/secrets.h" #include "system/filesys.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_krb5.h" #include "param/param.h" diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c index 64c21d0c3e1..76636bf89d9 100644 --- a/source4/auth/gensec/schannel_state.c +++ b/source4/auth/gensec/schannel_state.c @@ -25,7 +25,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "dsdb/samdb/samdb.h" #include "ldb_wrap.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "libcli/auth/libcli_auth.h" #include "auth/auth.h" #include "param/param.h" diff --git a/source4/auth/gensec/spnego_parse.c b/source4/auth/gensec/spnego_parse.c index 5ea8cf71002..a79f15b8eeb 100644 --- a/source4/auth/gensec/spnego_parse.c +++ b/source4/auth/gensec/spnego_parse.c @@ -23,7 +23,7 @@ #include "includes.h" #include "auth/gensec/spnego.h" #include "auth/gensec/gensec.h" -#include "lib/util/asn1.h" +#include "../lib/util/asn1.h" static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx, struct spnego_negTokenInit *token) diff --git a/source4/auth/kerberos/gssapi_parse.c b/source4/auth/kerberos/gssapi_parse.c index 77e907d3fae..e5b13fc70dc 100644 --- a/source4/auth/kerberos/gssapi_parse.c +++ b/source4/auth/kerberos/gssapi_parse.c @@ -22,7 +22,7 @@ */ #include "includes.h" -#include "lib/util/asn1.h" +#include "../lib/util/asn1.h" #include "auth/gensec/gensec.h" /* diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 0f1ef3ccdb7..bf6dc846e74 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "auth/auth.h" #include "auth/ntlm/auth_proto.h" #include "lib/events/events.h" diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c index 1b8233b8a49..ac36d4f1efd 100644 --- a/source4/auth/ntlm/auth_sam.c +++ b/source4/auth/ntlm/auth_sam.c @@ -23,7 +23,7 @@ #include "librpc/gen_ndr/ndr_netlogon.h" #include "system/time.h" #include "lib/ldb/include/ldb.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "auth/auth.h" #include "auth/ntlm/ntlm_check.h" #include "auth/ntlm/auth_proto.h" diff --git a/source4/auth/sam.c b/source4/auth/sam.c index a2090afcdc5..19ddc7cb74b 100644 --- a/source4/auth/sam.c +++ b/source4/auth/sam.c @@ -23,7 +23,7 @@ #include "system/time.h" #include "auth/auth.h" #include <ldb.h> -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" #include "libcli/ldap/ldap.h" diff --git a/source4/client/client.c b/source4/client/client.c index 266bd670250..3523c4d2748 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -41,7 +41,7 @@ #include "libcli/util/clilsa.h" #include "system/dir.h" #include "system/filesys.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "system/readline.h" #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" diff --git a/source4/cluster/ctdb/client/ctdb_client.c b/source4/cluster/ctdb/client/ctdb_client.c index a22cd09745f..a83dd7aebe8 100644 --- a/source4/cluster/ctdb/client/ctdb_client.c +++ b/source4/cluster/ctdb/client/ctdb_client.c @@ -21,12 +21,12 @@ #include "includes.h" #include "tdb_wrap.h" #include "../tdb/include/tdb.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* allocate a packet for use in client<->daemon communication diff --git a/source4/cluster/ctdb/common/ctdb_io.c b/source4/cluster/ctdb/common/ctdb_io.c index ecdbeae5160..9116bd69f72 100644 --- a/source4/cluster/ctdb/common/ctdb_io.c +++ b/source4/cluster/ctdb/common/ctdb_io.c @@ -23,7 +23,7 @@ #include "includes.h" #include "../tdb/include/tdb.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/source4/cluster/ctdb/common/ctdb_ltdb.c b/source4/cluster/ctdb/common/ctdb_ltdb.c index cae0aea0d92..e9ee55f6a73 100644 --- a/source4/cluster/ctdb/common/ctdb_ltdb.c +++ b/source4/cluster/ctdb/common/ctdb_ltdb.c @@ -24,7 +24,7 @@ #include "system/filesys.h" #include "../include/ctdb_private.h" #include "tdb_wrap.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* find an attached ctdb_db handle given a name diff --git a/source4/cluster/ctdb/common/ctdb_message.c b/source4/cluster/ctdb/common/ctdb_message.c index 28811b77f15..323e90c9e01 100644 --- a/source4/cluster/ctdb/common/ctdb_message.c +++ b/source4/cluster/ctdb/common/ctdb_message.c @@ -26,7 +26,7 @@ #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* this dispatches the messages to the registered ctdb message handler diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c index e782091eec2..4f6689a8344 100644 --- a/source4/cluster/ctdb/ctdb_cluster.c +++ b/source4/cluster/ctdb/ctdb_cluster.c @@ -27,7 +27,7 @@ #include "../tdb/include/tdb.h" #include "include/ctdb.h" #include "tdb_wrap.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "librpc/gen_ndr/misc.h" diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c index 20bba7a0d93..31b56ea52f0 100644 --- a/source4/dsdb/common/sidmap.c +++ b/source4/dsdb/common/sidmap.c @@ -26,7 +26,7 @@ #include "auth/auth.h" #include "libcli/ldap/ldap_ndr.h" #include "lib/ldb/include/ldb.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "libcli/security/security.h" #include "param/param.h" diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 2b74d722a18..21e6781d79a 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -25,7 +25,7 @@ #include "events.h" #include "ldb.h" #include "ldb_errors.h" -#include "lib/util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index 80b398ef5c9..800645014d2 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -27,7 +27,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/repl/drepl_service.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/dlinklist.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" diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c index f33959243e1..c66c5bbd191 100644 --- a/source4/dsdb/repl/drepl_out_pull.c +++ b/source4/dsdb/repl/drepl_out_pull.c @@ -27,7 +27,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/repl/drepl_service.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/dlinklist.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" diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c index 4f7afc08542..f36b735d325 100644 --- a/source4/dsdb/repl/drepl_partitions.c +++ b/source4/dsdb/repl/drepl_partitions.c @@ -27,7 +27,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/repl/drepl_service.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/dlinklist.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" diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c index 8745e210a10..7205c8b0f19 100644 --- a/source4/dsdb/repl/drepl_periodic.c +++ b/source4/dsdb/repl/drepl_periodic.c @@ -27,7 +27,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/repl/drepl_service.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/dlinklist.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" diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c index 3611258ca58..98d1c1b06c3 100644 --- a/source4/dsdb/repl/drepl_service.c +++ b/source4/dsdb/repl/drepl_service.c @@ -27,7 +27,7 @@ #include "lib/messaging/irpc.h" #include "dsdb/repl/drepl_service.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/dlinklist.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" diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 2be01bac56f..9853a753472 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -22,7 +22,7 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/dlinklist.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" diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index ca87159c588..916dc943be9 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -33,7 +33,7 @@ #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_misc.h" #include "auth/auth.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "param/param.h" diff --git a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c index 70f3e8ddfda..d90c2547a6e 100644 --- a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c +++ b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c @@ -29,7 +29,7 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" static int naming_fsmo_init(struct ldb_module *module) { diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c index 2c242d47c68..e610c358f6d 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass.c @@ -38,7 +38,7 @@ #include "ldb/include/ldb_errors.h" #include "ldb/include/ldb_private.h" #include "dsdb/samdb/samdb.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "librpc/ndr/libndr.h" #include "librpc/gen_ndr/ndr_security.h" #include "libcli/security/security.h" diff --git a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c index a5e7031a26f..198b6673582 100644 --- a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c +++ b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c @@ -28,7 +28,7 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" static int pdc_fsmo_init(struct ldb_module *module) { diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index a71ffff6185..f6e735df795 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -41,7 +41,7 @@ #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_security.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "ldb_wrap.h" struct samldb_ctx; diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c index 56d24a29628..1c0dccf3705 100644 --- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c +++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c @@ -29,7 +29,7 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" static int generate_objectClasses(struct ldb_context *ldb, struct ldb_message *msg, diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index 5d928ebce35..f75ea3c4f7c 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -34,7 +34,7 @@ #include "system/time.h" #include "system/filesys.h" #include "ldb_wrap.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/flags.h" #include "param/param.h" diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c index 688d1ef9de3..d4ef79aac1f 100644 --- a/source4/dsdb/samdb/samdb_privilege.c +++ b/source4/dsdb/samdb/samdb_privilege.c @@ -24,7 +24,7 @@ #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "libcli/security/security.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "param/param.h" /* diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c index d983e3c2720..93697a3df0e 100644 --- a/source4/dsdb/schema/schema_init.c +++ b/source4/dsdb/schema/schema_init.c @@ -23,7 +23,7 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/util/dlinklist.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" diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c index b6e8ed46c28..f8de82e56a3 100644 --- a/source4/dsdb/schema/schema_set.c +++ b/source4/dsdb/schema/schema_set.c @@ -24,7 +24,7 @@ #include "dsdb/samdb/samdb.h" #include "lib/ldb/include/ldb_errors.h" #include "lib/ldb/include/ldb_private.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c index 51f464cd096..3a1379bee44 100644 --- a/source4/kdc/hdb-samba4.c +++ b/source4/kdc/hdb-samba4.c @@ -41,7 +41,7 @@ #include "auth/auth.h" #include "auth/credentials/credentials.h" #include "auth/auth_sam.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "librpc/ndr/libndr.h" #include "librpc/gen_ndr/ndr_drsblobs.h" diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 83c6f1c2ee1..cf6dbf0c93d 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -29,7 +29,7 @@ #include "lib/events/events.h" #include "lib/socket/socket.h" #include "system/network.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" #include "librpc/gen_ndr/samr.h" diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 603332e69eb..d662844c4eb 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -25,7 +25,7 @@ #include "lib/events/events.h" #include "lib/socket/socket.h" #include "system/network.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/ldb/include/ldb.h" #include "auth/gensec/gensec.h" #include "auth/credentials/credentials.h" diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c index ffbef3d92fe..32fc00832e0 100644 --- a/source4/ldap_server/ldap_backend.c +++ b/source4/ldap_server/ldap_backend.c @@ -19,7 +19,7 @@ #include "includes.h" #include "ldap_server/ldap_server.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/ldap/ldap.h" #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c index fe917cf7f27..334e427d798 100644 --- a/source4/ldap_server/ldap_extended.c +++ b/source4/ldap_server/ldap_extended.c @@ -19,7 +19,7 @@ #include "includes.h" #include "ldap_server/ldap_server.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/ldap/ldap.h" #include "lib/tls/tls.h" #include "smbd/service_stream.h" diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 0aa9afbdd68..f08f24595a4 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -26,8 +26,8 @@ #include "auth/auth.h" #include "auth/credentials/credentials.h" #include "librpc/gen_ndr/ndr_samr.h" -#include "lib/util/dlinklist.h" -#include "lib/util/asn1.h" +#include "../lib/util/dlinklist.h" +#include "../lib/util/asn1.h" #include "ldap_server/ldap_server.h" #include "smbd/service_task.h" #include "smbd/service_stream.h" diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c index d4f930b4622..150383e7f9e 100644 --- a/source4/lib/charset/iconv.c +++ b/source4/lib/charset/iconv.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "system/iconv.h" #include "system/filesys.h" #include "param/param.h" diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c index bcc5fa393ae..daed8c11e5a 100644 --- a/source4/lib/com/main.c +++ b/source4/lib/com/main.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/com/com.h" #include "lib/events/events.h" #include "librpc/gen_ndr/com_dcom.h" diff --git a/source4/lib/com/tables.c b/source4/lib/com/tables.c index 11bf95c4d65..ed21da7cd80 100644 --- a/source4/lib/com/tables.c +++ b/source4/lib/com/tables.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/com/com.h" #include "librpc/gen_ndr/ndr_misc.h" diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 2125ba1fe6b..dcc29180cc1 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -23,15 +23,15 @@ #include "lib/events/events.h" #include "system/filesys.h" #include "messaging/messaging.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/socket/socket.h" #include "librpc/gen_ndr/ndr_irpc.h" #include "lib/messaging/irpc.h" #include "tdb_wrap.h" -#include "lib/util/unix_privs.h" +#include "../lib/util/unix_privs.h" #include "librpc/rpc/dcerpc.h" #include "../tdb/include/tdb.h" -#include "lib/util/util_tdb.h" +#include "../lib/util/util_tdb.h" #include "cluster/cluster.h" #include "param/param.h" diff --git a/source4/lib/registry/interface.c b/source4/lib/registry/interface.c index c9b3b064470..81ca2c39bcb 100644 --- a/source4/lib/registry/interface.c +++ b/source4/lib/registry/interface.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/registry/registry.h" #include "system/filesys.h" diff --git a/source4/lib/registry/local.c b/source4/lib/registry/local.c index 4af95e2dd62..a3aee06b133 100644 --- a/source4/lib/registry/local.c +++ b/source4/lib/registry/local.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/registry/registry.h" #include "system/filesys.h" diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index e134e3e5321..fe2091dde8d 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -29,8 +29,8 @@ struct smb_iconv_convenience; #include "libcli/util/werror.h" #include "librpc/gen_ndr/security.h" #include "libcli/util/ntstatus.h" -#include "util/time.h" -#include "util/data_blob.h" +#include "../lib/util/time.h" +#include "../lib/util/data_blob.h" /** * The hive API. This API is generally used for diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c index c327f02bbd4..b4e7c2bf320 100644 --- a/source4/lib/socket/interface.c +++ b/source4/lib/socket/interface.c @@ -22,7 +22,7 @@ #include "includes.h" #include "system/network.h" #include "lib/socket/netif.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" /** used for network interfaces */ diff --git a/source4/lib/stream/packet.c b/source4/lib/stream/packet.c index 92fa0e5a548..72a7e6485c7 100644 --- a/source4/lib/stream/packet.c +++ b/source4/lib/stream/packet.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "lib/socket/socket.h" #include "lib/stream/packet.h" diff --git a/source4/lib/tdb_wrap.c b/source4/lib/tdb_wrap.c index 4dd2e785c67..da27803b060 100644 --- a/source4/lib/tdb_wrap.c +++ b/source4/lib/tdb_wrap.c @@ -21,7 +21,7 @@ #include "includes.h" #include "../tdb/include/tdb.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "tdb_wrap.h" #include "tdb.h" diff --git a/source4/lib/torture/torture.c b/source4/lib/torture/torture.c index 33959ded16e..166bb7eb844 100644 --- a/source4/lib/torture/torture.c +++ b/source4/lib/torture/torture.c @@ -20,7 +20,7 @@ #include "includes.h" #include "torture/torture.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "system/filesys.h" diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c index 860bd358d5e..9f1a1595732 100644 --- a/source4/libcli/cldap/cldap.c +++ b/source4/libcli/cldap/cldap.c @@ -33,7 +33,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/ldap/ldap.h" #include "libcli/ldap/ldap_ndr.h" #include "libcli/cldap/cldap.h" diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h index c1a3b6b63e1..c78e395faaa 100644 --- a/source4/libcli/cldap/cldap.h +++ b/source4/libcli/cldap/cldap.h @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lib/util/asn1.h" +#include "../lib/util/asn1.h" #include "../libcli/netlogon.h" struct ldap_message; diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c index 06b7bd57714..18bfd689d26 100644 --- a/source4/libcli/dgram/dgramsocket.c +++ b/source4/libcli/dgram/dgramsocket.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/dgram/libdgram.h" #include "lib/socket/socket.h" #include "param/param.h" diff --git a/source4/libcli/dgram/mailslot.c b/source4/libcli/dgram/mailslot.c index 4f9d0bfc7c0..2d92fc7b143 100644 --- a/source4/libcli/dgram/mailslot.c +++ b/source4/libcli/dgram/mailslot.c @@ -33,7 +33,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/dgram/libdgram.h" #include "lib/socket/socket.h" #include "param/param.h" diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c index fc6de7993e4..87c89daf9f4 100644 --- a/source4/libcli/ldap/ldap.c +++ b/source4/libcli/ldap/ldap.c @@ -23,7 +23,7 @@ */ #include "includes.h" -#include "lib/util/asn1.h" +#include "../lib/util/asn1.h" #include "libcli/ldap/ldap.h" #include "libcli/ldap/ldap_proto.h" diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index fc5863b671f..a59356761b4 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -23,8 +23,8 @@ */ #include "includes.h" -#include "lib/util/asn1.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/asn1.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "lib/socket/socket.h" #include "libcli/ldap/ldap.h" diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c index 3b945800337..b34e026b189 100644 --- a/source4/libcli/ldap/ldap_controls.c +++ b/source4/libcli/ldap/ldap_controls.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/asn1.h" +#include "../lib/util/asn1.h" #include "libcli/ldap/ldap.h" #include "lib/ldb/include/ldb.h" diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c index f8ef343e3a3..db43c9e20c9 100644 --- a/source4/libcli/raw/clitransport.c +++ b/source4/libcli/raw/clitransport.c @@ -23,7 +23,7 @@ #include "libcli/raw/libcliraw.h" #include "libcli/raw/raw_proto.h" #include "lib/socket/socket.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "lib/stream/packet.h" #include "librpc/gen_ndr/ndr_nbt.h" diff --git a/source4/libcli/raw/rawnotify.c b/source4/libcli/raw/rawnotify.c index bf7578d7fcc..28ab3eb1a4e 100644 --- a/source4/libcli/raw/rawnotify.c +++ b/source4/libcli/raw/rawnotify.c @@ -20,7 +20,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "libcli/raw/raw_proto.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /**************************************************************************** change notify (async send) diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c index dd9b1f3e963..353b66c6220 100644 --- a/source4/libcli/raw/rawrequest.c +++ b/source4/libcli/raw/rawrequest.c @@ -25,7 +25,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "libcli/raw/raw_proto.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "param/param.h" #include "librpc/ndr/libndr.h" diff --git a/source4/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c index 2f529863dc9..d68df567058 100644 --- a/source4/libcli/raw/rawtrans.c +++ b/source4/libcli/raw/rawtrans.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/raw/libcliraw.h" #include "libcli/raw/raw_proto.h" diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c index dbc4a2ede74..7f4ae4d79f1 100644 --- a/source4/libcli/resolve/resolve.c +++ b/source4/libcli/resolve/resolve.c @@ -27,7 +27,7 @@ #include "librpc/gen_ndr/ndr_nbt.h" #include "param/param.h" #include "system/network.h" -#include "util/dlinklist.h" +#include "../lib/util/dlinklist.h" struct resolve_state { struct resolve_context *ctx; diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c index 137e2f2f12d..cc355fc33e7 100644 --- a/source4/libcli/smb2/request.c +++ b/source4/libcli/smb2/request.c @@ -23,7 +23,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "libcli/smb2/smb2.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "libcli/smb2/smb2_calls.h" #include "param/param.h" diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c index b946a102c87..6d7531f4b5b 100644 --- a/source4/libcli/smb2/transport.c +++ b/source4/libcli/smb2/transport.c @@ -27,7 +27,7 @@ #include "lib/socket/socket.h" #include "lib/events/events.h" #include "lib/stream/packet.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 0a4e52bd7ba..84bda8c8585 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/socket/socket.h" #include "libcli/wrepl/winsrepl.h" #include "librpc/gen_ndr/ndr_winsrepl.h" diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 43f86489217..f4de9031ec7 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -27,7 +27,7 @@ #include "param/secrets.h" #include "dsdb/samdb/samdb.h" #include "ldb_wrap.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "libcli/security/security.h" #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_krb5.h" diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c index 9d417d280d7..1fe07b60dc8 100644 --- a/source4/libnet/libnet_samdump.c +++ b/source4/libnet/libnet_samdump.c @@ -22,7 +22,7 @@ #include "includes.h" #include "libnet/libnet.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "samba3/samba3.h" #include "libcli/security/security.h" diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index c72aef7d702..8b7dd1f5989 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -27,7 +27,7 @@ #include "libcli/ldap/ldap_ndr.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "librpc/gen_ndr/ndr_misc.h" #include "ldb_wrap.h" #include "libcli/security/security.h" diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 42d6f72dd14..7b686ba0072 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -26,7 +26,7 @@ #include "libnet/libnet.h" #include "lib/events/events.h" #include "dsdb/samdb/samdb.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "librpc/ndr/libndr.h" diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index c5e4c447942..e19a1eb9bad 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -28,7 +28,7 @@ #include "includes.h" #include "librpc/ndr/libndr.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "librpc/gen_ndr/dcerpc.h" #include "param/param.h" diff --git a/source4/librpc/ndr/ndr_drsuapi.c b/source4/librpc/ndr/ndr_drsuapi.c index e77ab54071e..cb022d2ad39 100644 --- a/source4/librpc/ndr/ndr_drsuapi.c +++ b/source4/librpc/ndr/ndr_drsuapi.c @@ -23,7 +23,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_misc.h" -#include "lib/util/asn1.h" +#include "../lib/util/asn1.h" #include "librpc/ndr/ndr_compression.h" void ndr_print_drsuapi_DsReplicaObjectListItem(struct ndr_print *ndr, const char *name, diff --git a/source4/librpc/ndr/ndr_table.c b/source4/librpc/ndr/ndr_table.c index d73e82bb713..6308ba20dda 100644 --- a/source4/librpc/ndr/ndr_table.c +++ b/source4/librpc/ndr/ndr_table.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "librpc/ndr/libndr.h" #include "librpc/ndr/ndr_table.h" diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 4e07cc7b57c..bd8e60d4bde 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "librpc/rpc/dcerpc.h" #include "librpc/rpc/dcerpc_proto.h" diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c index 08eebe0c555..fbe22aa781b 100644 --- a/source4/nbt_server/defense.c +++ b/source4/nbt_server/defense.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "system/network.h" #include "nbt_server/nbt_server.h" #include "nbt_server/wins/winsserver.h" diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index 1bc3e2b62fd..c5b16fbd757 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -26,7 +26,7 @@ #include "lib/ldb/include/ldb.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "param/param.h" #include "smbd/service_task.h" #include "cldap_server/cldap_server.h" diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c index 76bc145903a..49406440cf7 100644 --- a/source4/nbt_server/interfaces.c +++ b/source4/nbt_server/interfaces.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "nbt_server/nbt_server.h" #include "smbd/service_task.h" #include "lib/socket/socket.h" diff --git a/source4/nbt_server/nodestatus.c b/source4/nbt_server/nodestatus.c index a5f1426f37a..8dc1f450537 100644 --- a/source4/nbt_server/nodestatus.c +++ b/source4/nbt_server/nodestatus.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "system/network.h" #include "nbt_server/nbt_server.h" #include "lib/socket/socket.h" diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c index a8809e84a2c..be1492f1cd1 100644 --- a/source4/nbt_server/query.c +++ b/source4/nbt_server/query.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "system/network.h" #include "nbt_server/nbt_server.h" #include "nbt_server/wins/winsserver.h" diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c index ebdb4dc0f8c..1192cba3376 100644 --- a/source4/nbt_server/register.c +++ b/source4/nbt_server/register.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "nbt_server/nbt_server.h" #include "smbd/service_task.h" #include "libcli/composite/composite.h" diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c index 3573fac3ead..1636aa91e78 100644 --- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c +++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c @@ -34,7 +34,7 @@ #include "auth/auth.h" #include "dsdb/samdb/samdb.h" #include "ldb_wrap.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "rpc_server/common/common.h" #include "param/param.h" diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 9bc36a17626..322814ef5d7 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -31,7 +31,7 @@ #include "auth/auth.h" #include "auth/credentials/credentials.h" #include "ntvfs/ntvfs.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "libcli/resolve/resolve.h" diff --git a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c index a61ac16669b..34a26b06b48 100644 --- a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c +++ b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c @@ -31,7 +31,7 @@ #include "system/filesys.h" #include "cifsposix.h" #include "system/time.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" #include "ntvfs/cifs_posix_cli/proto.h" diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c index a35ef365b02..dbe4722d37e 100644 --- a/source4/ntvfs/common/notify.c +++ b/source4/ntvfs/common/notify.c @@ -26,12 +26,12 @@ #include "includes.h" #include "system/filesys.h" #include "../tdb/include/tdb.h" -#include "lib/util/util_tdb.h" +#include "../lib/util/util_tdb.h" #include "messaging/messaging.h" #include "tdb_wrap.h" #include "lib/messaging/irpc.h" #include "librpc/gen_ndr/ndr_notify.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "ntvfs/common/ntvfs_common.h" #include "ntvfs/sysdep/sys_notify.h" #include "cluster/cluster.h" diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c index 8ac7ac7d034..5a63edcc3e9 100644 --- a/source4/ntvfs/ipc/vfs_ipc.c +++ b/source4/ntvfs/ipc/vfs_ipc.c @@ -25,7 +25,7 @@ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" #include "libcli/rap/rap.h" #include "ntvfs/ipc/proto.h" diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index 1385481bbc6..c2501aaba9f 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -23,7 +23,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" #include "param/param.h" diff --git a/source4/ntvfs/ntvfs_util.c b/source4/ntvfs/ntvfs_util.c index fadbe2b80a4..11631392552 100644 --- a/source4/ntvfs/ntvfs_util.c +++ b/source4/ntvfs/ntvfs_util.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c index fa855555b2a..02ed058af79 100644 --- a/source4/ntvfs/posix/pvfs_acl_nfs4.c +++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c @@ -22,7 +22,7 @@ #include "includes.h" #include "vfs_posix.h" -#include "lib/util/unix_privs.h" +#include "../lib/util/unix_privs.h" #include "librpc/gen_ndr/ndr_nfs4acl.h" #include "libcli/security/security.h" diff --git a/source4/ntvfs/posix/pvfs_acl_xattr.c b/source4/ntvfs/posix/pvfs_acl_xattr.c index 1cf52718c2b..87bb6bcb944 100644 --- a/source4/ntvfs/posix/pvfs_acl_xattr.c +++ b/source4/ntvfs/posix/pvfs_acl_xattr.c @@ -21,7 +21,7 @@ #include "includes.h" #include "vfs_posix.h" -#include "lib/util/unix_privs.h" +#include "../lib/util/unix_privs.h" #include "librpc/gen_ndr/ndr_xattr.h" /* diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c index 0054455838a..173b2fe187f 100644 --- a/source4/ntvfs/posix/pvfs_lock.c +++ b/source4/ntvfs/posix/pvfs_lock.c @@ -22,7 +22,7 @@ #include "includes.h" #include "vfs_posix.h" #include "system/time.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "messaging/messaging.h" diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c index 06d2bc8e0c6..719b7fa5fc7 100644 --- a/source4/ntvfs/posix/pvfs_notify.c +++ b/source4/ntvfs/posix/pvfs_notify.c @@ -23,7 +23,7 @@ #include "vfs_posix.h" #include "lib/messaging/irpc.h" #include "messaging/messaging.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" /* pending notifies buffer, hung off struct pvfs_file for open directories diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index 8dbc6742419..8a32f012233 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -23,7 +23,7 @@ #include "vfs_posix.h" #include "system/dir.h" #include "system/time.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "messaging/messaging.h" #include "librpc/gen_ndr/xattr.h" diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c index e0fe4fb64d9..b8468457318 100644 --- a/source4/ntvfs/posix/pvfs_search.c +++ b/source4/ntvfs/posix/pvfs_search.c @@ -25,7 +25,7 @@ #include "librpc/gen_ndr/security.h" #include "smbd/service_stream.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* place a reasonable limit on old-style searches as clients tend to not send search close requests */ diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c index 291250befd2..c22a0c8792d 100644 --- a/source4/ntvfs/posix/pvfs_wait.c +++ b/source4/ntvfs/posix/pvfs_wait.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "vfs_posix.h" #include "smbd/service_stream.h" #include "lib/messaging/irpc.h" diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c index 7a2945cd054..1ca09402a32 100644 --- a/source4/ntvfs/posix/pvfs_xattr.c +++ b/source4/ntvfs/posix/pvfs_xattr.c @@ -21,7 +21,7 @@ #include "includes.h" #include "vfs_posix.h" -#include "lib/util/unix_privs.h" +#include "../lib/util/unix_privs.h" #include "librpc/gen_ndr/ndr_xattr.h" #include "param/param.h" diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index 797496dd789..601c876cfb9 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -28,7 +28,7 @@ #include "librpc/gen_ndr/security.h" #include "../tdb/include/tdb.h" #include "tdb_wrap.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "libcli/security/security.h" #include "lib/events/events.h" #include "param/param.h" diff --git a/source4/ntvfs/posix/xattr_system.c b/source4/ntvfs/posix/xattr_system.c index 9a89f2a338b..f22c0e9ea4b 100644 --- a/source4/ntvfs/posix/xattr_system.c +++ b/source4/ntvfs/posix/xattr_system.c @@ -21,7 +21,7 @@ #include "includes.h" #include "vfs_posix.h" -#include "lib/util/wrap_xattr.h" +#include "../lib/util/wrap_xattr.h" /* pull a xattr as a blob, from either a file or a file descriptor diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c index dfc07f34832..5d904b4fcbd 100644 --- a/source4/ntvfs/simple/vfs_simple.c +++ b/source4/ntvfs/simple/vfs_simple.c @@ -30,7 +30,7 @@ #include "system/filesys.h" #include "svfs.h" #include "system/time.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" #include "ntvfs/simple/proto.h" diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c index 68b475a0845..2c1461b9167 100644 --- a/source4/ntvfs/smb2/vfs_smb2.c +++ b/source4/ntvfs/smb2/vfs_smb2.c @@ -35,7 +35,7 @@ #include "auth/auth.h" #include "auth/credentials/credentials.h" #include "ntvfs/ntvfs.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "libcli/resolve/resolve.h" #include "libcli/smb2/smb2.h" diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index 093c15abab6..e4e7c446866 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -25,7 +25,7 @@ #include "system/filesys.h" #include "ntvfs/sysdep/sys_notify.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/raw/smb.h" #include "param/param.h" diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c index a0322bbcc1a..6e28b465501 100644 --- a/source4/ntvfs/sysdep/sys_lease.c +++ b/source4/ntvfs/sysdep/sys_lease.c @@ -26,7 +26,7 @@ #include "system/filesys.h" #include "ntvfs/sysdep/sys_lease.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" /* list of registered backends */ diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index 9770323c3fa..d84979e44ce 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -26,7 +26,7 @@ #include "system/filesys.h" #include "ntvfs/sysdep/sys_notify.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" /* list of registered backends */ diff --git a/source4/param/generic.c b/source4/param/generic.c index b86e3ad2342..80735d2a338 100644 --- a/source4/param/generic.c +++ b/source4/param/generic.c @@ -17,7 +17,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "system/filesys.h" diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 0042dbd876b..dbc4776bd8c 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -60,7 +60,7 @@ #include "system/network.h" /* needed for TCP_NODELAY */ #include "smb_server/smb_server.h" #include "libcli/raw/signing.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "param/loadparm.h" #include "libcli/raw/libcliraw.h" diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 45d3765b7aa..576df0a4fe4 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -28,8 +28,8 @@ #include "tdb_wrap.h" #include "lib/ldb/include/ldb.h" #include "../tdb/include/tdb.h" -#include "lib/util/util_tdb.h" -#include "lib/util/util_ldb.h" +#include "../lib/util/util_tdb.h" +#include "../lib/util/util_ldb.h" #include "librpc/gen_ndr/ndr_security.h" /** diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 893055d3b1a..1d1efa74808 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -24,7 +24,7 @@ #include "librpc/gen_ndr/ndr_dcerpc.h" #include "auth/auth.h" #include "auth/gensec/gensec.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "rpc_server/dcerpc_server.h" #include "rpc_server/dcerpc_server_proto.h" #include "librpc/rpc/dcerpc_proto.h" diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c index 4831fb063da..284354feb48 100644 --- a/source4/rpc_server/handles.c +++ b/source4/rpc_server/handles.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "rpc_server/dcerpc_server.h" /* diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 836fd8dc621..9cda7d0d899 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -23,7 +23,7 @@ */ #include "rpc_server/lsa/lsa.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "libcli/ldap/ldap_ndr.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" diff --git a/source4/rpc_server/lsa/lsa.h b/source4/rpc_server/lsa/lsa.h index b7c41486a2d..ffdf96d091b 100644 --- a/source4/rpc_server/lsa/lsa.h +++ b/source4/rpc_server/lsa/lsa.h @@ -30,7 +30,7 @@ #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" #include "param/secrets.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "librpc/gen_ndr/ndr_dssetup.h" #include "param/param.h" diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index b948d1210e8..470c27a0756 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -29,7 +29,7 @@ #include "dsdb/samdb/samdb.h" #include "dsdb/common/flags.h" #include "rpc_server/samr/proto.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "libcli/auth/libcli_auth.h" #include "auth/gensec/schannel_state.h" #include "libcli/security/security.h" diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 9daf4f2194c..0fe7928cb5f 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -34,7 +34,7 @@ #include "libcli/ldap/ldap_ndr.h" #include "libcli/security/security.h" #include "rpc_server/samr/proto.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "param/param.h" /* these query macros make samr_Query[User|Group]Info a bit easier to read */ diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c index 98d998acc3d..8a855a7bdba 100644 --- a/source4/rpc_server/samr/samr_password.c +++ b/source4/rpc_server/samr/samr_password.c @@ -32,7 +32,7 @@ #include "auth/auth.h" #include "rpc_server/samr/proto.h" #include "libcli/auth/libcli_auth.h" -#include "util/util_ldb.h" +#include "../lib/util/util_ldb.h" #include "param/param.h" /* diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c index 2ef8591c320..f168614ad5b 100644 --- a/source4/rpc_server/service_rpc.c +++ b/source4/rpc_server/service_rpc.c @@ -25,7 +25,7 @@ #include "librpc/gen_ndr/ndr_dcerpc.h" #include "auth/auth.h" #include "auth/gensec/gensec.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "rpc_server/dcerpc_server.h" #include "lib/events/events.h" #include "smbd/service_task.h" diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c index 4f018a51439..bd250361a40 100644 --- a/source4/smb_server/blob.c +++ b/source4/smb_server/blob.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "smb_server/smb_server.h" #include "librpc/gen_ndr/ndr_misc.h" #include "ntvfs/ntvfs.h" diff --git a/source4/smb_server/handle.c b/source4/smb_server/handle.c index 56f9c5825e7..6ee4e163ad3 100644 --- a/source4/smb_server/handle.c +++ b/source4/smb_server/handle.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" diff --git a/source4/smb_server/session.c b/source4/smb_server/session.c index e7970eb7d51..0e626307d6a 100644 --- a/source4/smb_server/session.c +++ b/source4/smb_server/session.c @@ -21,7 +21,7 @@ #include "includes.h" #include "smb_server/smb_server.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index 0e820cfe0e9..40ffeeef48f 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "smb_server/smb_server.h" #include "librpc/gen_ndr/ndr_misc.h" #include "ntvfs/ntvfs.h" diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h index b3c3122765e..e3e55ae0404 100644 --- a/source4/smb_server/smb_server.h +++ b/source4/smb_server/smb_server.h @@ -23,7 +23,7 @@ #include "libcli/raw/interfaces.h" #include "lib/events/events.h" #include "lib/socket/socket.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* this header declares the core context structures associated with smb diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c index b18901325c2..12131ea2597 100644 --- a/source4/smb_server/tcon.c +++ b/source4/smb_server/tcon.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "smb_server/smb_server.h" #include "smbd/service_stream.h" #include "ntvfs/ntvfs.h" diff --git a/source4/smbd/service.c b/source4/smbd/service.c index 2b1fcc4bd87..52db2801e99 100644 --- a/source4/smbd/service.c +++ b/source4/smbd/service.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "smbd/process_model.h" /* diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c index 6bb8f99622e..0309557acb2 100644 --- a/source4/torture/basic/aliases.c +++ b/source4/torture/basic/aliases.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/raw/libcliraw.h" #include "libcli/raw/raw_proto.h" #include "torture/torture.h" diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c index e90337fd51a..98c53aac217 100644 --- a/source4/torture/basic/mangle_test.c +++ b/source4/torture/basic/mangle_test.c @@ -22,7 +22,7 @@ #include "system/filesys.h" #include "system/dir.h" #include "../tdb/include/tdb.h" -#include "lib/util/util_tdb.h" +#include "../lib/util/util_tdb.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c index fdb4251c15e..6184ad266d6 100644 --- a/source4/torture/ldap/schema.c +++ b/source4/torture/ldap/schema.c @@ -26,7 +26,7 @@ #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "dsdb/samdb/samdb.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "torture/torture.h" #include "torture/ldap/proto.h" diff --git a/source4/torture/ldap/uptodatevector.c b/source4/torture/ldap/uptodatevector.c index 3c491dca054..6200f4c3de7 100644 --- a/source4/torture/ldap/uptodatevector.c +++ b/source4/torture/ldap/uptodatevector.c @@ -26,7 +26,7 @@ #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "dsdb/samdb/samdb.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "torture/torture.h" #include "torture/ldap/proto.h" diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index 463d2a5000b..2b1bff40ee6 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -26,7 +26,7 @@ #include "libnet/libnet.h" #include "lib/events/events.h" #include "dsdb/samdb/samdb.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "librpc/ndr/libndr.h" diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index 2664d3e7f52..be09018acf4 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -25,7 +25,7 @@ #include "includes.h" #include "system/time.h" #include "system/filesys.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" #include "torture/torture.h" diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c index 63636f8c5f7..8d4d43b2a07 100644 --- a/source4/torture/ndr/ndr.c +++ b/source4/torture/ndr/ndr.c @@ -22,7 +22,7 @@ #include "torture/ndr/ndr.h" #include "torture/ndr/proto.h" #include "torture/torture.h" -#include "util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" struct ndr_pull_test_data { diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index c35f93e3f90..3e5d2d4323e 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -25,7 +25,7 @@ #include "torture/rpc/rpc.h" #include "torture/smbtorture.h" #include "librpc/ndr/ndr_table.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" static bool torture_rpc_teardown (struct torture_context *tcase, void *data) diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 6a02af5bb5b..2d2aaa80d6e 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -24,7 +24,7 @@ #include "includes.h" #include "torture/torture.h" #include "auth/auth.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "../lib/crypto/crypto.h" #include "system/time.h" #include "torture/rpc/rpc.h" diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c index ab6309d55f8..dc2a82414be 100644 --- a/source4/torture/rpc/spoolss_notify.c +++ b/source4/torture/rpc/spoolss_notify.c @@ -29,7 +29,7 @@ #include "smb_server/smb_server.h" #include "librpc/rpc/dcerpc_proto.h" #include "lib/socket/netif.h" -#include "util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "ntvfs/ntvfs.h" #include "param/param.h" diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c index 120a71cc952..9418650de45 100644 --- a/source4/torture/smb2/smb2.c +++ b/source4/torture/smb2/smb2.c @@ -23,7 +23,7 @@ #include "torture/smbtorture.h" #include "torture/smb2/proto.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" static bool wrap_simple_1smb2_test(struct torture_context *torture_ctx, struct torture_tcase *tcase, diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 1329f03b04b..302fefcc885 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -31,7 +31,7 @@ #include "dynconfig/dynconfig.h" #include "torture/smbtorture.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "librpc/rpc/dcerpc.h" #include "param/param.h" diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 54fe0ead270..6c49cf01cd6 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -21,7 +21,7 @@ #include "includes.h" #include "system/time.h" #include "torture/torture.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" #include "lib/cmdline/popt_common.h" diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c index 32e4453acad..22fdfec62b6 100644 --- a/source4/torture/util_smb.c +++ b/source4/torture/util_smb.c @@ -29,7 +29,7 @@ #include "system/wait.h" #include "system/time.h" #include "torture/torture.h" -#include "util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "auth/credentials/credentials.h" #include "libcli/resolve/resolve.h" #include "param/param.h" diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index d7419927709..74eea9e60b4 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -30,7 +30,7 @@ #include "system/network.h" #include "lib/socket/netif.h" #include "lib/tls/tls.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" /* don't allow connections to hang around forever */ diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c index 66697868e02..dcbb3c7fb66 100644 --- a/source4/web_server/wsgi.c +++ b/source4/web_server/wsgi.c @@ -22,8 +22,8 @@ #include "includes.h" #include "web_server/web_server.h" -#include "lib/util/dlinklist.h" -#include "lib/util/data_blob.h" +#include "../lib/util/dlinklist.h" +#include "../lib/util/data_blob.h" #include "lib/tls/tls.h" #include <Python.h> diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c index 638fac00a16..b8309597d7b 100644 --- a/source4/winbind/wb_server.c +++ b/source4/winbind/wb_server.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/socket/socket.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "smbd/service_task.h" #include "smbd/process_model.h" diff --git a/source4/winbind/wb_sid2domain.c b/source4/winbind/wb_sid2domain.c index fcf02cedcde..cb9fa3ada28 100644 --- a/source4/winbind/wb_sid2domain.c +++ b/source4/winbind/wb_sid2domain.c @@ -25,7 +25,7 @@ #include "smbd/service_task.h" #include "winbind/wb_async_helpers.h" #include "libcli/security/security.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" static struct wbsrv_domain *find_domain_from_sid(struct wbsrv_service *service, diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index 48a68e44329..d0b02d0abe3 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "smbd/service_task.h" #include "smbd/service.h" #include "lib/messaging/irpc.h" |