Fix include paths to new location of libutil.

diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index 4756c0640df391e3a196c1d48ff47d4db451a6c9..ef346542a64a030fa1effbcbd8ed5f71917c9b3e 100644 (file)
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
 */
 
 #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)
 
 /* 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 34aa1e2cb9caee6a597feecfd3dbc3101122a95d..c8e83b92668b42028a6d8dfba1884f1db727bd6b 100644 (file)
--- a/lib/util/asn1.h
+++ b/lib/util/asn1.h
@@ -49,6 +49,6 @@ struct asn1_data {
 
 #define ASN1_MAX_OIDS 20
 
 
 #define ASN1_MAX_OIDS 20
 

-#include "lib/util/asn1_proto.h"
+#include "../lib/util/asn1_proto.h"

 
 #endif /* _ASN_1_H */
 
 #endif /* _ASN_1_H */

diff --git a/lib/util/util_ldb.c b/lib/util/util_ldb.c
index 0465022edd6e7c6b4e4747227bf56a356b7835a4..70b18478c65db84f5ddc9d13359c855816189f54 100644 (file)
--- 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/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
 */
 /*
   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 e89085a31bd681247205f7220974b15ebeafc9bb..96fda5e86a7f2748f33b4d41d2c670613a264c78 100644 (file)
--- 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 "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 */
 
 /* 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 955f39a7ebb4b4a184f3948c564506af779a520a..b7e69c3676668ae16cde405940b6678a7ca7990b 100644 (file)
--- a/lib/util/wrap_xattr.c
+++ b/lib/util/wrap_xattr.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
 
 #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)
 
 #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 57531d2e7b404fa4982bf2880dad696d6fcc18b6..520e9d978a014758c319f1b5b23f6a60eb1e3b0d 100644 (file)
--- a/libcli/nbt/nbtsocket.c
+++ b/libcli/nbt/nbtsocket.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
 
 #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"
 #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 6c3bb2531eaef6715557e0856bd7933b2226a9ef..364e80a3a6d3213380e91ba8b828bf138880f4a8 100644 (file)
--- 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 "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"
 #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 64c21d0c3e195d08e01e581e4f47e7ac61f764b9..76636bf89d976a06431bb61eeb43c5041ca2d771 100644 (file)
--- 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 "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"
 #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 5ea8cf71002b9d386b3909e5d8a85e3242da6062..a79f15b8eebeb6169899509686ffe55333295b6a 100644 (file)
--- 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 "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)
 
 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 77e907d3fae6217a766b6aee0650f64ca77aa0a0..e5b13fc70dca45f06f17162cbb668b0909959858 100644 (file)
--- a/source4/auth/kerberos/gssapi_parse.c
+++ b/source4/auth/kerberos/gssapi_parse.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/asn1.h"
+#include "../lib/util/asn1.h"

 #include "auth/gensec/gensec.h"
 
 /*
 #include "auth/gensec/gensec.h"
 
 /*

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 0f1ef3ccdb71e24b13d1d445f2cebb30ebfc2192..bf6dc846e74bf949771b31805486244a66e4b633 100644 (file)
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 1b8233b8a49219b0eab4e3013bf4da789112fa28..ac36d4f1efd32fcf2c880e2dd28f4c1fa47801c0 100644 (file)
--- 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 "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"
 #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 a2090afcdc53372ee1e1e559b2b668ccaa4506a0..19ddc7cb74b923e92403eef13af180830ceaa741 100644 (file)
--- 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 "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"
 #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 266bd670250da182465ef41b04f58789c3920eb9..3523c4d2748c7452703e5145a95771e1f697a33d 100644 (file)
--- 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 "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"
 #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 a22cd09745f83346a9db2efe1938c23e62fe24fb..a83dd7aebe8f2ee9250323af4a33f7422a40b25f 100644 (file)
--- 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 "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/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
 
 /*
   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 ecdbeae5160414bb3bb9ba910705a77e6d0f8cee..9116bd69f72ccffa683de0ff29d141843ea17b1e 100644 (file)
--- 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 "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"
 #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 cae0aea0d92c6c16da6312c08b81cc80093074b1..e9ee55f6a731186ef92bc84af02db5bf127011df 100644 (file)
--- 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 "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
 
 /*
   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 28811b77f15960efb22ea2843f918bf0280719e1..323e90c9e0120ec865a988840a1738cc4f623ab4 100644 (file)
--- 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 "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
 
 /*
   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 e782091eec229967b43cef776b96c6bf65385401..4f6689a8344ea2c88db62ad6fe7e76308d86234c 100644 (file)
--- 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 "../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"
 
 #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 20bba7a0d93aa413955509da1537e58eca08261f..31b56ea52f0418a1b988f976acfb9ab526bf9264 100644 (file)
--- 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 "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"
 
 #include "libcli/security/security.h"
 #include "param/param.h"
 

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 2b74d722a18bbccbdfaa247ec3ce2821cb47c794..21e6781d79a032b0e9b8724da53b2380fa5206fb 100644 (file)
--- 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 "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"
 #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 80b398ef5c93ba49d37e34b1c8efec3e94ec50f0..800645014d208371b96b4f7a7aecbc605352cd25 100644 (file)
--- 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/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"
 #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 f33959243e15425a5cd0949df0b0813bf2cbe216..c66c5bbd1914ff0845728106006002ec6b6e28d5 100644 (file)
--- 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/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"
 #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 4f7afc08542f67fd2e5257946ce2ab254d3fffd7..f36b735d325da37fe4a589a53827c6be2fb1c2c3 100644 (file)
--- 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/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"
 #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 8745e210a108af139f2aae50e9f6dc2fe65630bd..7205c8b0f190991bb6f22b17cfebbbfe01d4f84a 100644 (file)
--- 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/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"
 #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 3611258ca586b995fdd3e2d1e74ababe74f2b9a1..98d1c1b06c33ed78035bc034c31e4f2f4dcdff95 100644 (file)
--- 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/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"
 #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 2be01bac56f15eaafbfd9b9aba13e655d4bba5fb..9853a753472c23e1962273b75fe4d31884dd643f 100644 (file)
--- 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 "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"
 #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 ca87159c5889badf33194af9a43b9e61c609b679..916dc943be9aff8b21a95513e16cec1f48036a08 100644 (file)
--- 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 "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"
 
 #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 70f3e8ddfdaef39c83bbcda45eaa70a9dbe95a5a..d90c2547a6ecc9a3050ba53f8470ed59ed40ef08 100644 (file)
--- 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 "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)
 {
 
 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 2c242d47c68e6db5e5468f9bc9f212aea11a2bff..e610c358f6d014f8f096eddc51aeba990538389a 100644 (file)
--- 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 "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"
 #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 a5e7031a26f116817a6fe462205fba665f55ee73..198b6673582f9f2db9d7f7022be5b30ac5391657 100644 (file)
--- 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 "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)
 {
 
 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 a71ffff61853afcbdc1ea23f1f26189505b04c59..f6e735df7959a7e7b0f9cfba1508dea377f3bf07 100644 (file)
--- 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 "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;
 #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 56d24a2962859ada27aa34c4a3f233b3c9a25b8a..1c0dccf3705c4aa905c55f62c2ab9b23e524c691 100644 (file)
--- 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 "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,
 #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 5d928ebce350b6e7dad60d8740dd7e505769d3fc..f75ea3c4f7c3a0f20f67548b5930e16e2cfb459a 100644 (file)
--- 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 "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"
 #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 688d1ef9de3da4586d3337f2fbee4573a85c7c48..d4ef79aac1fc6feed3ef8ecebcf0f14e4e0352cb 100644 (file)
--- 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 "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"
 
 /*
 #include "param/param.h"
 
 /*

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index d983e3c2720fe68762839b146fec2ddcb359fb6f..93697a3df0eb8880702bc9b929d6c019047888ef 100644 (file)
--- 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 "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"
 #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 b6e8ed46c28da96f5f99291c19736675632132b4..f8de82e56a3abe433a7cffc2e233a68a15c30270 100644 (file)
--- 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 "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"
 
 
 #include "param/param.h"
 
 

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 51f464cd096c75838a53b2926373a2d748fa9bda..3a1379bee448d9d45a0f4a984c07a7ae466be198 100644 (file)
--- 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 "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"
 #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 83c6f1c2ee15dc93a408c52bcfb2a7abb5ddb216..cf6dbf0c93d0532b05369441897f9e2a78b3aa88 100644 (file)
--- 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/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"
 #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 603332e69eb4282157d0e57e9f0b223f424ea20c..d662844c4eb287f3cbe4b87e70cce0b0f71b72e7 100644 (file)
--- 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/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"
 #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 ffbef3d92fe9dbb0a9b117dbb028bd566be4009d..32fc00832e05d7a1fa10de6c889e156b51a81c9d 100644 (file)
--- 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 "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"
 #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 fe917cf7f27d1c8ff8210cc442abf58216e79346..334e427d7985746ae5a51ef8bd4f62fe7bf45b7c 100644 (file)
--- 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 "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"
 #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 0aa9afbdd687d1f99013757865890abe9401d194..f08f24595a470e34dcf9a76c2da4f11d6348f224 100644 (file)
--- 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 "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"
 #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 d4f930b4622dc8893d4f58acd6a743374d5caf9d..150383e7f9ebf7b316b6c87b043a8b3ee33a3b38 100644 (file)
--- a/source4/lib/charset/iconv.c
+++ b/source4/lib/charset/iconv.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 bcc5fa393aea4be7dc20567af894755ca2fc9556..daed8c11e5acd3797c4600076c2774b6a6d695dc 100644 (file)
--- a/source4/lib/com/main.c
+++ b/source4/lib/com/main.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 11bf95c4d65bcae6abfdc852936e5a1e47d560e0..ed21da7cd809750b12a8dbd839f25756ee201810 100644 (file)
--- a/source4/lib/com/tables.c
+++ b/source4/lib/com/tables.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 
 #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 2125ba1fe6b88803a31bdf5978ad59d97218579c..dcc29180cc1a7be4897550765f1fc544fdc06811 100644 (file)
--- 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/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/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 "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"
 
 #include "cluster/cluster.h"
 #include "param/param.h"
 

diff --git a/source4/lib/registry/interface.c b/source4/lib/registry/interface.c
index c9b3b064470f3d49002a2f99622c6c452d161d37..81ca2c39bcbdc41bb058a7574778ebbf23369f60 100644 (file)
--- a/source4/lib/registry/interface.c
+++ b/source4/lib/registry/interface.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "lib/registry/registry.h"
 #include "system/filesys.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 4af95e2dd62d46fc9754bae51011934d675e9c45..a3aee06b1337f63a54e0020b47d22fa3c7bd1a24 100644 (file)
--- a/source4/lib/registry/local.c
+++ b/source4/lib/registry/local.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "lib/registry/registry.h"
 #include "system/filesys.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 e134e3e5321147ba3e3fbf99b43def8eea0226b2..fe2091dde8d50e81f6827bed4ebc766e97aa09a1 100644 (file)
--- 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 "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
 
 /**
  * The hive API. This API is generally used for

diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c
index c327f02bbd421405dfba57400d9cd3ab8040a6d7..b4e7c2bf3208a4892718553fc41dd0bbf47e9513 100644 (file)
--- 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 "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 */
 #include "param/param.h"
 
 /** used for network interfaces */

diff --git a/source4/lib/stream/packet.c b/source4/lib/stream/packet.c
index 92fa0e5a548af0d0053f67a5bbfc48494a53dff6..72a7e6485c708ed1bafd559638762fa7e8d8bc79 100644 (file)
--- a/source4/lib/stream/packet.c
+++ b/source4/lib/stream/packet.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 4dd2e785c67ec1f187d23057b8b0f5242f56586f..da27803b06006b8c7c0c514957003e1e54dbbb7b 100644 (file)
--- 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 "includes.h"
 #include "../tdb/include/tdb.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "tdb_wrap.h"
 #include "tdb.h"
 
 #include "tdb_wrap.h"
 #include "tdb.h"
 

diff --git a/source4/lib/torture/torture.c b/source4/lib/torture/torture.c
index 33959ded16ec2f1c69c1e78be2c6676473ffdaed..166bb7eb8446caa8ae15b8770ebde94445d30c0a 100644 (file)
--- a/source4/lib/torture/torture.c
+++ b/source4/lib/torture/torture.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
 
 #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"
 
 #include "param/param.h"
 #include "system/filesys.h"
 

diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 860bd358d5ec2139fba33c4ea95052cf48e995ce..9f1a1595732bf83b349575fd9b7dacc6b3a5ff86 100644 (file)
--- 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 "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"
 #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 c1a3b6b63e1abc9d3b46c57f1b517460646d3662..c78e395faaa291f38d715ca41b0728c5842cf6a9 100644 (file)
--- 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/>.
 */
 
    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;
 #include "../libcli/netlogon.h"
 
 struct ldap_message;

diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 06b7bd57714bab1415dd379121a3f4b6d03a6021..18bfd689d26c3374afd2fd4e8b003722f74f4d91 100644 (file)
--- 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 "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"
 #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 4f9d0bfc7c03ee985270c5887759bf31486ed339..2d92fc7b143149c77d7df4f37520efab58efac39 100644 (file)
--- 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 "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"
 #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 fc6de7993e4e5d047c7d556753a1380471aa8cb2..87c89daf9f47301a2665f2011bf24122c0028ce6 100644 (file)
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/asn1.h"
+#include "../lib/util/asn1.h"

 #include "libcli/ldap/ldap.h"
 #include "libcli/ldap/ldap_proto.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 fc5863b671f32ee3d8ac4d757d35cab185542f64..a59356761b440658d1506b34388b0f69c48c351f 100644 (file)
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -23,8 +23,8 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 3b94580033729aa2edf1ccd849a6864f5e0990a9..b34e026b189e3e550e57cbec18d74fafd5a519b3 100644 (file)
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/asn1.h"
+#include "../lib/util/asn1.h"

 #include "libcli/ldap/ldap.h"
 #include "lib/ldb/include/ldb.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 f8ef343e3a3f24b5400418fc5147112c5782ca4d..db43c9e20c911a987702008572ef8585bde8b360 100644 (file)
--- 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 "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"
 #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 bf7578d7fccbff861418f2b6d0da647833fe1f41..28ab3eb1a4ec6c4a916542ce29adb6d4f70df47f 100644 (file)
--- 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 "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)
 
 /****************************************************************************
 change notify (async send)

diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c
index dd9b1f3e963c76014534a332398c7bcf148ce96c..353b66c6220271a808688a73ef5e121e41aebaed 100644 (file)
--- 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 "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"
 #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 2f529863dc94171b1e93ce02ebcca9d5b58b9870..d68df56705896889274c12fb62d540c734f8c268 100644 (file)
--- a/source4/libcli/raw/rawtrans.c
+++ b/source4/libcli/raw/rawtrans.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #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 "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 dbc4a2ede749a58ac7e1686d94cbf654ea712f69..7f4ae4d79f1082f00f3aaf23be580dfb8c5f0b49 100644 (file)
--- 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 "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;
 
 struct resolve_state {
        struct resolve_context *ctx;

diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 137e2f2f12dee0f745443781104c0dadfaec4e21..cc355fc33e7c5601f927020ca8aad0b77a35c742 100644 (file)
--- 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 "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"
 #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 b946a102c87236b3b58db11480a3b3fac7968167..6d7531f4b5bd77b3bf14a8a5a61e7326a21caa58 100644 (file)
--- 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/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 0a4e52bd7baff71c912d89262516cb6458cf8e2e..84bda8c8585eaa99e497f7d982304abeff973ce7 100644 (file)
--- 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 "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"
 #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 43f86489217cf2e64f21f2624eadb89ba76c88d4..f4de9031ec7fb747e0d9ed4274fc4b8e3f721ad6 100644 (file)
--- 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 "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"
 #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 9d417d280d71a9d44fa625210fa4b5aa6d9dad49..1fe07b60dc83b335fb0a4e6e4a98275a791aa701 100644 (file)
--- a/source4/libnet/libnet_samdump.c
+++ b/source4/libnet/libnet_samdump.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
 
 #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"
 
 #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 c72aef7d7025b2ed3a894375e81116e69f26c246..8b7dd1f59891beec4fc29007c5d04f79ee04b87a 100644 (file)
--- 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 "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"
 #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 42d6f72dd14303ff4234c349655023980c796aed..7b686ba0072f8e9505043846a043decc651b016d 100644 (file)
--- 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 "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"
 #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 c5e4c447942ffe6f5ca533efd3f8e30b39c609be..e19a1eb9badf5ff530fe97e557d9f1c1a902fdbc 100644 (file)
--- 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 "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"
 
 #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 e77ab54071eae0f3511d51741c06400e97b9660b..cb022d2ad399ae58eb1a772746dda4171173f0e2 100644 (file)
--- 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 "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, 
 #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 d73e82bb71344a7bceb1d1d60f296721d86f9238..6308ba20dda9b9885a982fdc003b8d334135ed3a 100644 (file)
--- a/source4/librpc/ndr/ndr_table.c
+++ b/source4/librpc/ndr/ndr_table.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_table.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 4e07cc7b57c89e4233da1df00f7fdca70131de8e..bd8e60d4bdeb9e0905630cd3e9eb9eddd3933f8b 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 08eebe0c555be9cd8cabb3e5762d9990aa598d9b..fbe22aa781bb7568efbc5506bb4553ef726b20a5 100644 (file)
--- a/source4/nbt_server/defense.c
+++ b/source4/nbt_server/defense.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 1bc3e2b62fd63f7b260ec1549111719f95ec6cc2..c5b16fbd7576b5c72fb1dc5b752518aed2f4cb11 100644 (file)
--- 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 "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"
 #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 76bc145903a97e5802ed34449a84d1c3d21a00ed..49406440cf75831b690501c71a47e15d39a66144 100644 (file)
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 a5f1426f37a04441c861c172a431373abdbdd7a9..8dc1f450537564d30729e945036757175946713f 100644 (file)
--- a/source4/nbt_server/nodestatus.c
+++ b/source4/nbt_server/nodestatus.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 a8809e84a2c403854481f8555bc642c61a9ca06d..be1492f1cd1bb4bc8ca4f03a5d0011673d8585f6 100644 (file)
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 ebdb4dc0f8ce2b8546f39a8c2dd21410cccbf0fe..1192cba3376317ee784ca5fd037e2ed3afa28d71 100644 (file)
--- 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 "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"
 #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 3573fac3eadcfbd94b272cc2346260bddd34f72d..1636aa91e78a7ff90662ac5ffd1fa450ccdf1046 100644 (file)
--- 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 "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"
 
 #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 9bc36a176266d61510db9cc668b51ae946681faf..322814ef5d7816ae3abf2a3f8ee0b41d3c5d7c2e 100644 (file)
--- 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 "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 "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 a61ac16669bd0a8f3615bc932d97d0fa25739b11..34a26b06b48a528c11001007a618606e3b076ea2 100644 (file)
--- 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 "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"
 
 #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 a35ef365b0225457a1ed0df22fadf617d8e2d326..dbe4722d37e487ac0d4720613308156dd766607e 100644 (file)
--- 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 "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 "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"
 #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 8ac7ac7d03486bc2194c283b3a3e89cbe797eff0..5a63edcc3e97caecc114bee5a2ba68593b09ba00 100644 (file)
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -25,7 +25,7 @@
 
 
 #include "includes.h"
 
 
 #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"
 #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 1385481bbc68224fac5fcc61aec9a1ad727bb060..c2501aaba9f4a3dc90a184943826572d921e7f08 100644 (file)
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
 
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
 

diff --git a/source4/ntvfs/ntvfs_util.c b/source4/ntvfs/ntvfs_util.c
index fadbe2b80a4bad5e43ab817bb3d26cc3e5534587..116313925522f88b302323dba6cfe8b30973c14c 100644 (file)
--- a/source4/ntvfs/ntvfs_util.c
+++ b/source4/ntvfs/ntvfs_util.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "ntvfs/ntvfs.h"
 
 
 #include "ntvfs/ntvfs.h"
 
 

diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c
index fa855555b2af3a9fc286984bf679384e63af09fa..02ed058af794115b0ba667fb893686867d726b44 100644 (file)
--- 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 "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"
 
 #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 1cf52718c2b7b25ed2ead09311b5db386b0be848..87bb6bcb94401783fd9f29fdca4dee672300d6b7 100644 (file)
--- 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 "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 "librpc/gen_ndr/ndr_xattr.h"
 
 /*

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 0054455838a98246df26b0410e20bd2666d6bd5f..173b2fe187fdee8108b629ea57da02733afbff2f 100644 (file)
--- 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 "includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "messaging/messaging.h"
 
 
 #include "messaging/messaging.h"
 
 

diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c
index 06d2bc8e0c65b16b08a4a4e0e87725f03435ea6b..719b7fa5fc70c227d771ba4cd45d987d4449304a 100644 (file)
--- 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 "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
 #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 8dbc6742419602c00044629dd74c10461679da33..8a32f0122335c6549872462d6ee200c93ea2ade6 100644 (file)
--- 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 "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"
 
 #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 e0fe4fb64d9ca5ebe84c2f6c1c6974652d0c2606..b84684573189be632b946af9abfb483e59e846dd 100644 (file)
--- 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 "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 */
 
 /* 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 291250befd2eaf986fec2574674a5f1a1f22ffb6..c22a0c8792d48bd305d3c586a825d4174a21dcb5 100644 (file)
--- 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 "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"
 #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 7a2945cd05499e8343fc2bf8e0d5d7f2fbf81557..1ca09402a322aa3275da4428eeb6e7a1dde6defc 100644 (file)
--- 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 "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"
 
 #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 797496dd7893b1180e4c894edfc4ba81db10f692..601c876cfb9aa2bc28bfa1ec611ccc72ef1d0d9c 100644 (file)
--- 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 "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"
 #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 9a89f2a338b70a72fadc2327de1e2889d34ba1c9..f22c0e9ea4b04d1d6bf3cdc988412bdd44add525 100644 (file)
--- 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 "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
 
 /*
   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 dfc07f348329efcc9ffc8cdfd81ac59bac4e38b0..5d904b4fcbdc0c6e6bc1ef20b4e213349e608b3d 100644 (file)
--- 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 "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"
 
 #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 68b475a0845fd355e4a9d5341aeff5e1f28bd95e..2c1461b9167679a01c7af1bb7388e3798067502e 100644 (file)
--- 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 "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"
 #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 093c15abab6d3a2a9d16bac61a3ed30bfba747af..e4e7c446866718a034ca6f66bfe3a5020c976445 100644 (file)
--- 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 "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"
 
 #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 a0322bbcc1adcfce448bd6bdebc3a5e5b2a57707..6e28b46550146cb8dd734169bd73244c6016981c 100644 (file)
--- 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 "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 */
 #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 9770323c3fa0ec343b9aed4f72098ede9b9cb1a1..d84979e44cea32bd286a2c471c18d252d57f7ce0 100644 (file)
--- 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 "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 */
 #include "param/param.h"
 
 /* list of registered backends */

diff --git a/source4/param/generic.c b/source4/param/generic.c
index b86e3ad2342db1003ca812177121633e8e981ed3..80735d2a3384921b59635844c4a7e76bf855d3be 100644 (file)
--- a/source4/param/generic.c
+++ b/source4/param/generic.c
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
  */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "param/param.h"
 #include "system/filesys.h"
 
 #include "param/param.h"
 #include "system/filesys.h"
 

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 0042dbd876b80738a3f867118826a66b28d7dcbf..dbc4776bd8c3cdf73f674843885e5dcb0f61a196 100644 (file)
--- 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 "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"
 #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 45d3765b7aa60136beb2da4c01f10043195ecfa1..576df0a4fe475de523807eef4816cdfb940afa3a 100644 (file)
--- 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 "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"
 
 /**
 #include "librpc/gen_ndr/ndr_security.h"
 
 /**

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 893055d3b1ad70f078b2541edc38acccdaa174e2..1d1efa74808cdb0db2b31d22ed2e44f3b1ceef6f 100644 (file)
--- 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 "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"
 #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 4831fb063da91551f847ac2af496fce4fe034f41..284354feb484380ac9dc24bf75010efd3ad268b9 100644 (file)
--- a/source4/rpc_server/handles.c
+++ b/source4/rpc_server/handles.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "rpc_server/dcerpc_server.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 836fd8dc621645a7a8939b5d80658387b7d609f3..9cda7d0d899ae0fe75fbfedc67ece1937153e379 100644 (file)
--- 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 "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"
 #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 b7c41486a2da5a79087054465e571fd28cf74d60..ffdf96d091bb3c07343c24c53913618be004b229 100644 (file)
--- 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 "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"
 
 #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 b948d1210e88483d84be5113900681dde1f3fe0e..470c27a075687ba6df5da74e36d86d0a662cd563 100644 (file)
--- 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 "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"
 #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 9daf4f2194c6c8900008b4abde09ff766a2eb51f..0fe7928cb5fccd52d8ac41cbd30e10d07bb2289d 100644 (file)
--- 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 "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 */
 #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 98d998acc3dbed46f920c4dec66058e7e65d2ad3..8a855a7bdba6957b98720cd913cafce9e353f125 100644 (file)
--- 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 "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"
 
 /* 
 #include "param/param.h"
 
 /* 

diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 2ef8591c320a97144d7a737a7e040479f9125a28..f168614ad5b7f9cfbead5db5a38709c8420e2b01 100644 (file)
--- 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 "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"
 #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 4f018a51439612f257e506caef9d9d15deddef4b..bd250361a402d0cebe00dcd15ac21baa101851e6 100644 (file)
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 56f9c5825e74c2445221a5afad27ee0a804d5e02..6ee4e163ad3d82aa648887005ce43e05e193cf78 100644 (file)
--- a/source4/smb_server/handle.c
+++ b/source4/smb_server/handle.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.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 e7970eb7d511768f30e69c7bb20688f91e004b5c..0e626307d6a25796c2d545417968ec49ac3f8d1c 100644 (file)
--- 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 "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 0e820cfe0e99f74021135ed201a6c2aa9f1b2ee2..40ffeeef48f99935a66fb0eb3fb37a7d0be65611 100644 (file)
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 b3c3122765e513f9fb3a73f676a38be8fec8a44d..e3e55ae040477c375f9e9e181cabbc9a9bbaaf49 100644 (file)
--- 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 "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
 
 /*
   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 b18901325c2f7dba90a526e94d7ddc0ee82c0e8e..12131ea25978cbfbfa67785a960260d94a14a479 100644 (file)
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 2b1fcc4bd87e6eed0ce4308ccf051cc17f54679f..52db2801e99274d722842432aec481e25e4e5c86 100644 (file)
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"

 #include "smbd/process_model.h"
 
 /*
 #include "smbd/process_model.h"
 
 /*

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 6bb8f99622e2af77789549c1c16bf188aad7d2a3..0309557acb2df776abbfb4b0e9570491c5d83a05 100644 (file)
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 e90337fd51a9d72230f9aafd55ceedd81cda8da2..98c53aac217b5cb26a028a52c402dc14f0ca900b 100644 (file)
--- 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 "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"
 
 #include "libcli/libcli.h"
 #include "torture/util.h"
 

diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c
index fdb4251c15ea8e2505c7ef77ad18315a1da54ad4..6184ad266d61596ad70ff2217f20f5908081c59b 100644 (file)
--- 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/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"
 
 #include "torture/torture.h"
 #include "torture/ldap/proto.h"

diff --git a/source4/torture/ldap/uptodatevector.c b/source4/torture/ldap/uptodatevector.c
index 3c491dca0544e55db4afd8e524297067f1db468d..6200f4c3de78a0f7f560dbd954ea4f343ca25f6b 100644 (file)
--- 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/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"
 
 #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 463d2a5000bcf965d7755a2187810d071deac29f..2b1bff40ee64efedeb50882676f82a613f8ed8c4 100644 (file)
--- 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 "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"
 #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 2664d3e7f52d04e9590e7e26071a638aaaed8f06..be09018acf4aa2059fecfc307f4ef80a100a0457 100644 (file)
--- 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 "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"
 #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 63636f8c5f7856fead65b525a6d8b97a2b454d75..8d4d43b2a0753840008a4192471905d4ca507e37 100644 (file)
--- 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 "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 {
 #include "param/param.h"
 
 struct ndr_pull_test_data {

diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index c35f93e3f90571a0ee1d661b0468cc62f93ecb78..3e5d2d4323e81b55161e0bc2fe018a55a17eee31 100644 (file)
--- 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 "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)
 
 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 6a02af5bb5b31a94cf19d6cfbcd19f0ca85d9062..2d2aaa80d6e3633e5f2f5a42625ff67f360af841 100644 (file)
--- 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 "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"
 #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 ab6309d55f8015eb5b7ed645d2603b575befd687..dc2a82414bec99892937be52b90dd7eb6ad892c2 100644 (file)
--- 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 "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"
 
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
 

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 120a71cc952deb0778a965cb5ce8da232b5e1b41..9418650de452c05854798db90cf464a2e03fa44b 100644 (file)
--- 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 "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,
 
 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 1329f03b04b19f78f598ef4777ae9ee66bbca1ea..302fefcc88510f83683244dfa62515958f8362b9 100644 (file)
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -31,7 +31,7 @@
 #include "dynconfig/dynconfig.h"
 
 #include "torture/smbtorture.h"
 #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"
 
 #include "librpc/rpc/dcerpc.h"
 #include "param/param.h"
 

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 54fe0ead2700da6fae9fdfbe3272c38cb40b3e4c..6c49cf01cd6064acdf64e1d68739b27a9d657aae 100644 (file)
--- 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 "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"
 
 #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 32e4453acad9ce81f3c9688587df8dad92299efd..22fdfec62b6202a5e0078cd26f8ba7d7a32e83d6 100644 (file)
--- 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 "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"
 #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 d74199277091f09027d5a696020de43d38bd40f3..74eea9e60b412b5b967139f66a8f1ec8f10d5e85 100644 (file)
--- 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 "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 */
 #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 66697868e0270c4a169c67517681dab6976c9750..dcbb3c7fb6638d66f8a3364cb458e0f67f3e0942 100644 (file)
--- 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 "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>
 
 #include "lib/tls/tls.h"
 #include <Python.h>
 

diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 638fac00a16a6b698374b58b8ed1863f45f2c4ad..b8309597d7b89c38f474aa0a90a7fd8e6679bf24 100644 (file)
--- 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 "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"
 #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 fcf02cedcdef7954a946c41b24d5fa7eda6e9ae8..cb9fa3ada28d189158718a027c952ec6c7eda084 100644 (file)
--- 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 "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,
 #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 48a68e44329872648aaf1834b4daff57b08ed6a7..d0b02d0abe3616bfab4285adfaa6fd809464c386 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #include "smbd/service_task.h"
 #include "smbd/service.h"
 #include "lib/messaging/irpc.h"