65 files changed, 33 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index e585504ce5..fa4fc5f377 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,11 +231,11 @@ source4/lib/tdb/bin/tdbtool
 source4/lib/tdb/bin/tdbtorture
 source4/lib/tdr/tdr_proto.h
 source4/lib/util/apidocs
-source4/lib/util/asn1_proto.h
-source4/lib/util/pidfile.h
-source4/lib/util/unix_privs.h
-source4/lib/util/util_proto.h
-source4/lib/util/util_tdb.h
+lib/util/asn1_proto.h
+lib/util/pidfile.h
+lib/util/unix_privs.h
+lib/util/util_proto.h
+lib/util/util_tdb.h
 source4/mkconfig.mk
 source4/nbt_server/dgram/proto.h
 source4/nbt_server/nbt_server_proto.h
diff --git a/source4/lib/util/Doxyfile b/lib/util/Doxyfile
index 02e36a7af9..02e36a7af9 100644
--- a/source4/lib/util/Doxyfile
+++ b/lib/util/Doxyfile
diff --git a/source4/lib/util/asn1.c b/lib/util/asn1.c
index 4756c0640d..4756c0640d 100644
--- a/source4/lib/util/asn1.c
+++ b/lib/util/asn1.c
diff --git a/source4/lib/util/asn1.h b/lib/util/asn1.h
index 34aa1e2cb9..34aa1e2cb9 100644
--- a/source4/lib/util/asn1.h
+++ b/lib/util/asn1.h
diff --git a/source4/lib/util/attr.h b/lib/util/attr.h
index f64b272a67..f64b272a67 100644
--- a/source4/lib/util/attr.h
+++ b/lib/util/attr.h
diff --git a/source4/lib/util/become_daemon.c b/lib/util/become_daemon.c
index 034114eade..034114eade 100644
--- a/source4/lib/util/become_daemon.c
+++ b/lib/util/become_daemon.c
diff --git a/source4/lib/util/byteorder.h b/lib/util/byteorder.h
index 894beccabf..894beccabf 100644
--- a/source4/lib/util/byteorder.h
+++ b/lib/util/byteorder.h
diff --git a/source4/lib/util/capability.c b/lib/util/capability.c
index 2d13826c14..2d13826c14 100644
--- a/source4/lib/util/capability.c
+++ b/lib/util/capability.c
diff --git a/source4/lib/util/capability.m4 b/lib/util/capability.m4
index 2a95a607d5..2a95a607d5 100644
--- a/source4/lib/util/capability.m4
+++ b/lib/util/capability.m4
diff --git a/source4/lib/util/config.mk b/lib/util/config.mk
index 925713a53c..925713a53c 100644
--- a/source4/lib/util/config.mk
+++ b/lib/util/config.mk
diff --git a/source4/lib/util/data_blob.c b/lib/util/data_blob.c
index 57b34b7ae7..57b34b7ae7 100644
--- a/source4/lib/util/data_blob.c
+++ b/lib/util/data_blob.c
diff --git a/source4/lib/util/data_blob.h b/lib/util/data_blob.h
index e9dca67772..e9dca67772 100644
--- a/source4/lib/util/data_blob.h
+++ b/lib/util/data_blob.h
diff --git a/source4/lib/util/debug.c b/lib/util/debug.c
index b6edb908c7..b6edb908c7 100644
--- a/source4/lib/util/debug.c
+++ b/lib/util/debug.c
diff --git a/source4/lib/util/debug.h b/lib/util/debug.h
index 8f4fa2a8fc..8f4fa2a8fc 100644
--- a/source4/lib/util/debug.h
+++ b/lib/util/debug.h
diff --git a/source4/lib/util/dlinklist.h b/lib/util/dlinklist.h
index 5624124459..5624124459 100644
--- a/source4/lib/util/dlinklist.h
+++ b/lib/util/dlinklist.h
diff --git a/source4/lib/util/dprintf.c b/lib/util/dprintf.c
index e4f02758eb..e4f02758eb 100644
--- a/source4/lib/util/dprintf.c
+++ b/lib/util/dprintf.c
diff --git a/source4/lib/util/fault.c b/lib/util/fault.c
index cb51cbd859..cb51cbd859 100644
--- a/source4/lib/util/fault.c
+++ b/lib/util/fault.c
diff --git a/source4/lib/util/fault.m4 b/lib/util/fault.m4
index b24e63641c..b24e63641c 100644
--- a/source4/lib/util/fault.m4
+++ b/lib/util/fault.m4
diff --git a/source4/lib/util/fsusage.c b/lib/util/fsusage.c
index 43c8787216..43c8787216 100644
--- a/source4/lib/util/fsusage.c
+++ b/lib/util/fsusage.c
diff --git a/source4/lib/util/fsusage.m4 b/lib/util/fsusage.m4
index 6d5d13fe25..6d5d13fe25 100644
--- a/source4/lib/util/fsusage.m4
+++ b/lib/util/fsusage.m4
diff --git a/source4/lib/util/genrand.c b/lib/util/genrand.c
index cd1823a9a0..cd1823a9a0 100644
--- a/source4/lib/util/genrand.c
+++ b/lib/util/genrand.c
diff --git a/source4/lib/util/idtree.c b/lib/util/idtree.c
index 193922973f..193922973f 100644
--- a/source4/lib/util/idtree.c
+++ b/lib/util/idtree.c
diff --git a/source4/lib/util/mainpage.dox b/lib/util/mainpage.dox
index 464151e771..464151e771 100644
--- a/source4/lib/util/mainpage.dox
+++ b/lib/util/mainpage.dox
diff --git a/source4/lib/util/ms_fnmatch.c b/lib/util/ms_fnmatch.c
index 5e04ec1f4b..5e04ec1f4b 100644
--- a/source4/lib/util/ms_fnmatch.c
+++ b/lib/util/ms_fnmatch.c
diff --git a/source4/lib/util/mutex.c b/lib/util/mutex.c
index 4d0df68eed..4d0df68eed 100644
--- a/source4/lib/util/mutex.c
+++ b/lib/util/mutex.c
diff --git a/source4/lib/util/mutex.h b/lib/util/mutex.h
index bf845906f2..bf845906f2 100644
--- a/source4/lib/util/mutex.h
+++ b/lib/util/mutex.h
diff --git a/source4/lib/util/params.c b/lib/util/params.c
index 3a9e2b9505..3a9e2b9505 100644
--- a/source4/lib/util/params.c
+++ b/lib/util/params.c
diff --git a/source4/lib/util/safe_string.h b/lib/util/safe_string.h
index a6c052f874..a6c052f874 100644
--- a/source4/lib/util/safe_string.h
+++ b/lib/util/safe_string.h
diff --git a/source4/lib/util/signal.c b/lib/util/signal.c
index ead947eb5e..ead947eb5e 100644
--- a/source4/lib/util/signal.c
+++ b/lib/util/signal.c
diff --git a/source4/lib/util/signal.m4 b/lib/util/signal.m4
index c6d7f72f68..c6d7f72f68 100644
--- a/source4/lib/util/signal.m4
+++ b/lib/util/signal.m4
diff --git a/source4/lib/util/system.c b/lib/util/system.c
index 9bd1800233..9bd1800233 100644
--- a/source4/lib/util/system.c
+++ b/lib/util/system.c
diff --git a/source4/lib/util/tests/file.c b/lib/util/tests/file.c
index 3377e833dc..3377e833dc 100644
--- a/source4/lib/util/tests/file.c
+++ b/lib/util/tests/file.c
diff --git a/source4/lib/util/tests/genrand.c b/lib/util/tests/genrand.c
index 5fe229c089..5fe229c089 100644
--- a/source4/lib/util/tests/genrand.c
+++ b/lib/util/tests/genrand.c
diff --git a/source4/lib/util/tests/idtree.c b/lib/util/tests/idtree.c
index d89fb8c489..d89fb8c489 100644
--- a/source4/lib/util/tests/idtree.c
+++ b/lib/util/tests/idtree.c
diff --git a/source4/lib/util/tests/str.c b/lib/util/tests/str.c
index 3bd6a02fdc..3bd6a02fdc 100644
--- a/source4/lib/util/tests/str.c
+++ b/lib/util/tests/str.c
diff --git a/source4/lib/util/tests/strlist.c b/lib/util/tests/strlist.c
index 9af26f9e71..9af26f9e71 100644
--- a/source4/lib/util/tests/strlist.c
+++ b/lib/util/tests/strlist.c
diff --git a/source4/lib/util/time.c b/lib/util/time.c
index 978d73cc0a..978d73cc0a 100644
--- a/source4/lib/util/time.c
+++ b/lib/util/time.c
diff --git a/source4/lib/util/time.h b/lib/util/time.h
index e4008c5782..e4008c5782 100644
--- a/source4/lib/util/time.h
+++ b/lib/util/time.h
diff --git a/source4/lib/util/time.m4 b/lib/util/time.m4
index f61ae4cd25..f61ae4cd25 100644
--- a/source4/lib/util/time.m4
+++ b/lib/util/time.m4
diff --git a/source4/lib/util/unix_privs.c b/lib/util/unix_privs.c
index 47c172dcfa..47c172dcfa 100644
--- a/source4/lib/util/unix_privs.c
+++ b/lib/util/unix_privs.c
diff --git a/source4/lib/util/util.c b/lib/util/util.c
index 5fc785d642..5fc785d642 100644
--- a/source4/lib/util/util.c
+++ b/lib/util/util.c
diff --git a/source4/lib/util/util.h b/lib/util/util.h
index ffe83c14b2..4616de9f94 100644
--- a/source4/lib/util/util.h
+++ b/lib/util/util.h
@@ -21,7 +21,7 @@
 #ifndef _SAMBA_UTIL_H_
 #define _SAMBA_UTIL_H_
 
-#include "util/attr.h"
+#include "../lib/util/attr.h"
 
 #include "charset/charset.h"
 
@@ -38,12 +38,12 @@ struct smbsrv_tcon;
 extern const char *logfile;
 extern const char *panic_action;
 
-#include "util/time.h"
-#include "util/data_blob.h"
-#include "util/xfile.h"
-#include "util/debug.h"
-#include "util/mutex.h"
-#include "util/byteorder.h"
+#include "../lib/util/time.h"
+#include "../lib/util/data_blob.h"
+#include "../lib/util/xfile.h"
+#include "../lib/util/debug.h"
+#include "../lib/util/mutex.h"
+#include "../lib/util/byteorder.h"
 
 /**
   this is a warning hack. The idea is to use this everywhere that we
diff --git a/source4/lib/util/util.m4 b/lib/util/util.m4
index 9e362954cd..9e362954cd 100644
--- a/source4/lib/util/util.m4
+++ b/lib/util/util.m4
diff --git a/source4/lib/util/util_file.c b/lib/util/util_file.c
index c3e22196c0..c3e22196c0 100644
--- a/source4/lib/util/util_file.c
+++ b/lib/util/util_file.c
diff --git a/source4/lib/util/util_getent.c b/lib/util/util_getent.c
index b9b2658f59..b9b2658f59 100644
--- a/source4/lib/util/util_getent.c
+++ b/lib/util/util_getent.c
diff --git a/source4/lib/util/util_ldb.c b/lib/util/util_ldb.c
index 0465022edd..0465022edd 100644
--- a/source4/lib/util/util_ldb.c
+++ b/lib/util/util_ldb.c
diff --git a/source4/lib/util/util_ldb.h b/lib/util/util_ldb.h
index 43f98ae1a9..43f98ae1a9 100644
--- a/source4/lib/util/util_ldb.h
+++ b/lib/util/util_ldb.h
diff --git a/source4/lib/util/util_pw.c b/lib/util/util_pw.c
index 11e46ec4e3..11e46ec4e3 100644
--- a/source4/lib/util/util_pw.c
+++ b/lib/util/util_pw.c
diff --git a/source4/lib/util/util_str.c b/lib/util/util_str.c
index 9ea6403c52..9ea6403c52 100644
--- a/source4/lib/util/util_str.c
+++ b/lib/util/util_str.c
diff --git a/source4/lib/util/util_strlist.c b/lib/util/util_strlist.c
index 30de4b962d..30de4b962d 100644
--- a/source4/lib/util/util_strlist.c
+++ b/lib/util/util_strlist.c
diff --git a/source4/lib/util/util_tdb.c b/lib/util/util_tdb.c
index e89085a31b..e89085a31b 100644
--- a/source4/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
diff --git a/source4/lib/util/wrap_xattr.c b/lib/util/wrap_xattr.c
index 955f39a7eb..955f39a7eb 100644
--- a/source4/lib/util/wrap_xattr.c
+++ b/lib/util/wrap_xattr.c
diff --git a/source4/lib/util/wrap_xattr.h b/lib/util/wrap_xattr.h
index 64b28d250c..64b28d250c 100644
--- a/source4/lib/util/wrap_xattr.h
+++ b/lib/util/wrap_xattr.h
diff --git a/source4/lib/util/xattr.m4 b/lib/util/xattr.m4
index 497809a47a..497809a47a 100644
--- a/source4/lib/util/xattr.m4
+++ b/lib/util/xattr.m4
diff --git a/source4/lib/util/xfile.c b/lib/util/xfile.c
index a016031a77..a016031a77 100644
--- a/source4/lib/util/xfile.c
+++ b/lib/util/xfile.c
diff --git a/source4/lib/util/xfile.h b/lib/util/xfile.h
index 2cc369d8d8..2cc369d8d8 100644
--- a/source4/lib/util/xfile.h
+++ b/lib/util/xfile.h
diff --git a/source4/Makefile b/source4/Makefile
index cab82674d2..345c16ed6e 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -74,7 +74,7 @@ socketwrappersrcdir := ../lib/socket_wrapper
 nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
-libutilsrcdir := lib/util
+libutilsrcdir := ../lib/util
 libtdrsrcdir := lib/tdr
 libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := ../lib/crypto
@@ -144,7 +144,7 @@ endif
 clean::
 	@find ../lib ../libcli -name '*.o' -o -name '*.hd' | xargs rm -f
 
-DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
+DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
 		  $(srcdir)/version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index 79c50ae5af..52b10c633c 100644
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -22,7 +22,7 @@
 #ifndef __CREDENTIALS_H__
 #define __CREDENTIALS_H__
 
-#include "util/data_blob.h"
+#include "../lib/util/data_blob.h"
 #include "librpc/gen_ndr/misc.h"
 
 struct ccache_container;
diff --git a/source4/configure.ac b/source4/configure.ac
index 611b8dd104..62f9dc43a0 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -14,13 +14,13 @@ m4_include(build/m4/env.m4)
 m4_include(../lib/replace/samba.m4)
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/config.m4)
-m4_include(lib/util/fault.m4)
-m4_include(lib/util/signal.m4)
-m4_include(lib/util/util.m4)
-m4_include(lib/util/fsusage.m4)
-m4_include(lib/util/xattr.m4)
-m4_include(lib/util/capability.m4)
-m4_include(lib/util/time.m4)
+m4_include(../lib/util/fault.m4)
+m4_include(../lib/util/signal.m4)
+m4_include(../lib/util/util.m4)
+m4_include(../lib/util/fsusage.m4)
+m4_include(../lib/util/xattr.m4)
+m4_include(../lib/util/capability.m4)
+m4_include(../lib/util/time.m4)
 m4_include(../lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 750ebc4137..1386ea510b 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -42,12 +42,12 @@
 #ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#include "util/util.h"
+#include "../lib/util/util.h"
 
 #include "libcli/util/error.h"
 
 /* String routines */
-#include "util/safe_string.h"
+#include "../lib/util/safe_string.h"
 
 #if 0
 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 3f4de7801a..1be1a54045 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -26,7 +26,7 @@
 #define __LIBNDR_H__
 
 #include <talloc.h>
-#include "lib/util/util.h" /* for discard_const */
+#include "../lib/util/util.h" /* for discard_const */
 #include <sys/time.h>
 #include "lib/charset/charset.h"
 
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 2b38c65669..482e803a35 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -27,7 +27,7 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
-#include "lib/util/data_blob.h"
+#include "../lib/util/data_blob.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/libndr.h"
 
diff --git a/source4/main.mk b/source4/main.mk
index 368dce9f59..8ce86b91ca 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -19,7 +19,7 @@ mkinclude lib/cmdline/config.mk
 mkinclude ../lib/socket_wrapper/config.mk
 mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/stream/config.mk
-mkinclude lib/util/config.mk
+mkinclude ../lib/util/config.mk
 mkinclude lib/tdr/config.mk
 mkinclude lib/dbwrap/config.mk
 mkinclude ../lib/crypto/config.mk
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 4cd9f6c865..1f87912e8b 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -28,14 +28,14 @@ TORTURE_LOCAL_OBJ_FILES = \
 		$(torturesrcdir)/../lib/messaging/tests/messaging.o \
 		$(torturesrcdir)/../lib/messaging/tests/irpc.o \
 		$(torturesrcdir)/../librpc/tests/binding_string.o \
-		$(torturesrcdir)/../lib/util/tests/idtree.o \
+		$(torturesrcdir)/../../lib/util/tests/idtree.o \
 		$(torturesrcdir)/../lib/socket/testsuite.o \
 		$(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
 		$(torturesrcdir)/../libcli/resolve/testsuite.o \
-		$(torturesrcdir)/../lib/util/tests/strlist.o \
-		$(torturesrcdir)/../lib/util/tests/str.o \
-		$(torturesrcdir)/../lib/util/tests/file.o \
-		$(torturesrcdir)/../lib/util/tests/genrand.o \
+		$(torturesrcdir)/../../lib/util/tests/strlist.o \
+		$(torturesrcdir)/../../lib/util/tests/str.o \
+		$(torturesrcdir)/../../lib/util/tests/file.o \
+		$(torturesrcdir)/../../lib/util/tests/genrand.o \
 		$(torturesrcdir)/../../lib/compression/testsuite.o \
 		$(torturesrcdir)/../lib/charset/tests/charset.o \
 		$(torturesrcdir)/../libcli/security/tests/sddl.o \
diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c
index 132d689dcb..f26c87bd85 100644
--- a/source4/utils/getntacl.c
+++ b/source4/utils/getntacl.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
-#include "lib/util/wrap_xattr.h"
+#include "../lib/util/wrap_xattr.h"
 #include "param/param.h"
 
 static void ntacl_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);