Move lib/util from source4 to top-level libutil.

Conflicts:

	source4/Makefile

diff --git a/.gitignore b/.gitignore
index e585504ce5e3c575a804d4a0725f5864226342c6..fa4fc5f37755f7e7cb48223b049abce07655873d 100644 (file)
--- 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
similarity index 100%
rename from source4/lib/util/Doxyfile
rename to lib/util/Doxyfile

diff --git a/source4/lib/util/asn1.c b/lib/util/asn1.c
similarity index 100%
rename from source4/lib/util/asn1.c
rename to lib/util/asn1.c

diff --git a/source4/lib/util/asn1.h b/lib/util/asn1.h
similarity index 100%
rename from source4/lib/util/asn1.h
rename to lib/util/asn1.h

diff --git a/source4/lib/util/attr.h b/lib/util/attr.h
similarity index 100%
rename from source4/lib/util/attr.h
rename to lib/util/attr.h

diff --git a/source4/lib/util/become_daemon.c b/lib/util/become_daemon.c
similarity index 100%
rename from source4/lib/util/become_daemon.c
rename to lib/util/become_daemon.c

diff --git a/source4/lib/util/byteorder.h b/lib/util/byteorder.h
similarity index 100%
rename from source4/lib/util/byteorder.h
rename to lib/util/byteorder.h

diff --git a/source4/lib/util/capability.c b/lib/util/capability.c
similarity index 100%
rename from source4/lib/util/capability.c
rename to lib/util/capability.c

diff --git a/source4/lib/util/capability.m4 b/lib/util/capability.m4
similarity index 100%
rename from source4/lib/util/capability.m4
rename to lib/util/capability.m4

diff --git a/source4/lib/util/config.mk b/lib/util/config.mk
similarity index 100%
rename from source4/lib/util/config.mk
rename to lib/util/config.mk

diff --git a/source4/lib/util/data_blob.c b/lib/util/data_blob.c
similarity index 100%
rename from source4/lib/util/data_blob.c
rename to lib/util/data_blob.c

diff --git a/source4/lib/util/data_blob.h b/lib/util/data_blob.h
similarity index 100%
rename from source4/lib/util/data_blob.h
rename to lib/util/data_blob.h

diff --git a/source4/lib/util/debug.c b/lib/util/debug.c
similarity index 100%
rename from source4/lib/util/debug.c
rename to lib/util/debug.c

diff --git a/source4/lib/util/debug.h b/lib/util/debug.h
similarity index 100%
rename from source4/lib/util/debug.h
rename to lib/util/debug.h

diff --git a/source4/lib/util/dlinklist.h b/lib/util/dlinklist.h
similarity index 100%
rename from source4/lib/util/dlinklist.h
rename to lib/util/dlinklist.h

diff --git a/source4/lib/util/dprintf.c b/lib/util/dprintf.c
similarity index 100%
rename from source4/lib/util/dprintf.c
rename to lib/util/dprintf.c

diff --git a/source4/lib/util/fault.c b/lib/util/fault.c
similarity index 100%
rename from source4/lib/util/fault.c
rename to lib/util/fault.c

diff --git a/source4/lib/util/fault.m4 b/lib/util/fault.m4
similarity index 100%
rename from source4/lib/util/fault.m4
rename to lib/util/fault.m4

diff --git a/source4/lib/util/fsusage.c b/lib/util/fsusage.c
similarity index 100%
rename from source4/lib/util/fsusage.c
rename to lib/util/fsusage.c

diff --git a/source4/lib/util/fsusage.m4 b/lib/util/fsusage.m4
similarity index 100%
rename from source4/lib/util/fsusage.m4
rename to lib/util/fsusage.m4

diff --git a/source4/lib/util/genrand.c b/lib/util/genrand.c
similarity index 100%
rename from source4/lib/util/genrand.c
rename to lib/util/genrand.c

diff --git a/source4/lib/util/idtree.c b/lib/util/idtree.c
similarity index 100%
rename from source4/lib/util/idtree.c
rename to lib/util/idtree.c

diff --git a/source4/lib/util/mainpage.dox b/lib/util/mainpage.dox
similarity index 100%
rename from source4/lib/util/mainpage.dox
rename to lib/util/mainpage.dox

diff --git a/source4/lib/util/ms_fnmatch.c b/lib/util/ms_fnmatch.c
similarity index 100%
rename from source4/lib/util/ms_fnmatch.c
rename to lib/util/ms_fnmatch.c

diff --git a/source4/lib/util/mutex.c b/lib/util/mutex.c
similarity index 100%
rename from source4/lib/util/mutex.c
rename to lib/util/mutex.c

diff --git a/source4/lib/util/mutex.h b/lib/util/mutex.h
similarity index 100%
rename from source4/lib/util/mutex.h
rename to lib/util/mutex.h

diff --git a/source4/lib/util/params.c b/lib/util/params.c
similarity index 100%
rename from source4/lib/util/params.c
rename to lib/util/params.c

diff --git a/source4/lib/util/safe_string.h b/lib/util/safe_string.h
similarity index 100%
rename from source4/lib/util/safe_string.h
rename to lib/util/safe_string.h

diff --git a/source4/lib/util/signal.c b/lib/util/signal.c
similarity index 100%
rename from source4/lib/util/signal.c
rename to lib/util/signal.c

diff --git a/source4/lib/util/signal.m4 b/lib/util/signal.m4
similarity index 100%
rename from source4/lib/util/signal.m4
rename to lib/util/signal.m4

diff --git a/source4/lib/util/system.c b/lib/util/system.c
similarity index 100%
rename from source4/lib/util/system.c
rename to lib/util/system.c

diff --git a/source4/lib/util/tests/file.c b/lib/util/tests/file.c
similarity index 100%
rename from source4/lib/util/tests/file.c
rename to lib/util/tests/file.c

diff --git a/source4/lib/util/tests/genrand.c b/lib/util/tests/genrand.c
similarity index 100%
rename from source4/lib/util/tests/genrand.c
rename to lib/util/tests/genrand.c

diff --git a/source4/lib/util/tests/idtree.c b/lib/util/tests/idtree.c
similarity index 100%
rename from source4/lib/util/tests/idtree.c
rename to lib/util/tests/idtree.c

diff --git a/source4/lib/util/tests/str.c b/lib/util/tests/str.c
similarity index 100%
rename from source4/lib/util/tests/str.c
rename to lib/util/tests/str.c

diff --git a/source4/lib/util/tests/strlist.c b/lib/util/tests/strlist.c
similarity index 100%
rename from source4/lib/util/tests/strlist.c
rename to lib/util/tests/strlist.c

diff --git a/source4/lib/util/time.c b/lib/util/time.c
similarity index 100%
rename from source4/lib/util/time.c
rename to lib/util/time.c

diff --git a/source4/lib/util/time.h b/lib/util/time.h
similarity index 100%
rename from source4/lib/util/time.h
rename to lib/util/time.h

diff --git a/source4/lib/util/time.m4 b/lib/util/time.m4
similarity index 100%
rename from source4/lib/util/time.m4
rename to lib/util/time.m4

diff --git a/source4/lib/util/unix_privs.c b/lib/util/unix_privs.c
similarity index 100%
rename from source4/lib/util/unix_privs.c
rename to lib/util/unix_privs.c

diff --git a/source4/lib/util/util.c b/lib/util/util.c
similarity index 100%
rename from source4/lib/util/util.c
rename to lib/util/util.c

diff --git a/source4/lib/util/util.h b/lib/util/util.h
similarity index 99%
rename from source4/lib/util/util.h
rename to lib/util/util.h
index ffe83c14b297d9573fc669e9b03fcaa4321b82cf..4616de9f9444dded524d6d47db5a6c0bd078adcf 100644 (file)
--- 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
similarity index 100%
rename from source4/lib/util/util.m4
rename to lib/util/util.m4

diff --git a/source4/lib/util/util_file.c b/lib/util/util_file.c
similarity index 100%
rename from source4/lib/util/util_file.c
rename to lib/util/util_file.c

diff --git a/source4/lib/util/util_getent.c b/lib/util/util_getent.c
similarity index 100%
rename from source4/lib/util/util_getent.c
rename to lib/util/util_getent.c

diff --git a/source4/lib/util/util_ldb.c b/lib/util/util_ldb.c
similarity index 100%
rename from source4/lib/util/util_ldb.c
rename to lib/util/util_ldb.c

diff --git a/source4/lib/util/util_ldb.h b/lib/util/util_ldb.h
similarity index 100%
rename from source4/lib/util/util_ldb.h
rename to lib/util/util_ldb.h

diff --git a/source4/lib/util/util_pw.c b/lib/util/util_pw.c
similarity index 100%
rename from source4/lib/util/util_pw.c
rename to lib/util/util_pw.c

diff --git a/source4/lib/util/util_str.c b/lib/util/util_str.c
similarity index 100%
rename from source4/lib/util/util_str.c
rename to lib/util/util_str.c

diff --git a/source4/lib/util/util_strlist.c b/lib/util/util_strlist.c
similarity index 100%
rename from source4/lib/util/util_strlist.c
rename to lib/util/util_strlist.c

diff --git a/source4/lib/util/util_tdb.c b/lib/util/util_tdb.c
similarity index 100%
rename from source4/lib/util/util_tdb.c
rename to lib/util/util_tdb.c

diff --git a/source4/lib/util/wrap_xattr.c b/lib/util/wrap_xattr.c
similarity index 100%
rename from source4/lib/util/wrap_xattr.c
rename to lib/util/wrap_xattr.c

diff --git a/source4/lib/util/wrap_xattr.h b/lib/util/wrap_xattr.h
similarity index 100%
rename from source4/lib/util/wrap_xattr.h
rename to lib/util/wrap_xattr.h

diff --git a/source4/lib/util/xattr.m4 b/lib/util/xattr.m4
similarity index 100%
rename from source4/lib/util/xattr.m4
rename to lib/util/xattr.m4

diff --git a/source4/lib/util/xfile.c b/lib/util/xfile.c
similarity index 100%
rename from source4/lib/util/xfile.c
rename to lib/util/xfile.c

diff --git a/source4/lib/util/xfile.h b/lib/util/xfile.h
similarity index 100%
rename from source4/lib/util/xfile.h
rename to lib/util/xfile.h

diff --git a/source4/Makefile b/source4/Makefile
index cab82674d212d4ebdc9c4f713b326e784fa86aaf..345c16ed6e8f41cca01dd63a5908fa2a268c1123 100644 (file)
--- 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 79c50ae5afff236b4df2546f5f0b44e063409ecb..52b10c633c3899ac0afb26f0674c5218418657ba 100644 (file)
--- 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 611b8dd104bcf70f7de104354ed70c145c0fb52f..62f9dc43a0a26bbd3feaabdc7c042dd6fb4d1e96 100644 (file)
--- 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 750ebc4137b31a343822b20fddf112a096746ec7..1386ea510b9aa4992c125090b7a2c20a5c7e377f 100644 (file)
--- 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 3f4de7801a4d0c076148d0b1d125d01d4ca179d8..1be1a5404577c0d353f2e40e072e10368f746c7b 100644 (file)
--- 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 2b38c65669077df7221ad58f69e2d65940d11627..482e803a359f462b174009843bdd23aeacd30530 100644 (file)
--- 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 368dce9f59ba38734a0db037d671a18630a75ce5..8ce86b91ca2eac19a9f2a7fad9c9918f584b4e2a 100644 (file)
--- 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 4cd9f6c865dc1a21626723336aa9d1ae717ff0cf..1f87912e8b0ed516f1cada33bde8c54c7a87bfb1 100644 (file)
--- 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 132d689dcbab51faf9e2244b3a9d52b9ca612784..f26c87bd85270cb64aef816eeb1dff20b310e511 100644 (file)
--- 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);