lib/util: move memcache.[ch] to the toplevel 'samba-util' library

This is generic enough that it could be used in all code.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Jul 18 15:43:33 CEST 2014 on sn-devel-104

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

diff --git a/source3/include/memcache.h b/lib/util/memcache.h
similarity index 100%
rename from source3/include/memcache.h
rename to lib/util/memcache.h

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index fe2c18339238d24a6e1f81123df527718b29f701..bcb7b66c7717fa07dc12b515b26dac9817b664dc 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samba-util',
                     util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
                     util_str.c util_str_common.c substitute.c ms_fnmatch.c
                     server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
-                    tevent_debug.c util_process.c''',
+                    tevent_debug.c util_process.c memcache.c''',
                   deps='DYNCONFIG',
                   public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd-daemon',
                   public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',

diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 8b0174fc44cbf73f6df2eb165d99bd9320e8f3a5..9bb014c32cd0eb9530f079bd4b83a808e703925b 100644 (file)
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -28,7 +28,7 @@
 #include "system/passwd.h"
 #include "auth.h"
 #include "secrets.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
 #include "../lib/util/util_pw.h"

diff --git a/source3/lib/access.c b/source3/lib/access.c
index a2de35caf490ebe553a4dc1b1ce01c217a9432ec..58db722706a12a62030fef25acbe2d2705fe8f2f 100644 (file)
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -11,7 +11,7 @@
 */
 
 #include "includes.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "lib/socket/interfaces.h"
 
 #define NAME_INDEX 0

diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 0fb1fd8280ef52db47c72aa165161b6d57f6623f..3e67d9ebe75d2b4fb1e202b2f0f8f542597505d8 100644 (file)
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -25,7 +25,7 @@
 #include "system/filesys.h"
 #include "system/glob.h"
 #include "util_tdb.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB

diff --git a/source3/lib/id_cache.c b/source3/lib/id_cache.c
index e6e345741c1cb555e0dd6c445d923e0328272802..3a703ae4af381ebe71b25a79e58d87377979c1d4 100644 (file)
--- a/source3/lib/id_cache.c
+++ b/source3/lib/id_cache.c
@@ -28,7 +28,7 @@
 #include "includes.h"
 #include "messages.h"
 #include "lib/id_cache.h"
-#include "include/memcache.h"
+#include "../lib/util/memcache.h"
 #include "idmap_cache.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../libcli/security/dom_sid.h"

diff --git a/source3/lib/username.c b/source3/lib/username.c
index 847aa33eab1aa7912c4e74c41f7b525cfabbaa75..f69d9c3bf2282b6cc12e0bf0f97acdffbef07126 100644 (file)
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "../lib/util/util_pw.h"
 
 /* internal functions */

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index c5de61a094b2110f6fa69888b906338e39967476..522f6002bc6ad855306ace928e041341ce721936 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "../lib/async_req/async_sock.h"
 #include "../lib/util/select.h"
 #include "lib/socket/interfaces.h"

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index fa44f3efbd03dbcecfb063807c8366d1a1c2bb82..5f24d7844aeb696c4fc60ddb43d2611397840c5c 100644 (file)
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -23,7 +23,7 @@
 #include "passdb.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "secrets.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "idmap_cache.h"
 #include "../libcli/security/security.h"
 #include "lib/winbind_util.h"

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 2c82856bc0aaf5fa78e430a4a13c09ba4a628fd0..ed42961435dc5598e9074054c51975dd1f414465 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -29,7 +29,7 @@
 #include "../librpc/gen_ndr/drsblobs.h"
 #include "../librpc/gen_ndr/ndr_drsblobs.h"
 #include "../librpc/gen_ndr/idmap.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "nsswitch/winbind_client.h"
 #include "../libcli/security/security.h"
 #include "../lib/util/util_pw.h"

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 818f77895e406c61b9cece44a4e1eed5d977b40c..55d774278bc53f5d2ab3026bf30036a56645277f 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -24,7 +24,7 @@
 #include "smbd/globals.h"
 #include "libcli/security/security.h"
 #include "lib/util/bitmap.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 
 /*
    This module implements directory related functions for Samba.

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 3eb65a132006fa7cb4af1d6db0cd616f79fb5ce9..e03c7c4180bcb8057f431fb483d370d65ba50aac 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "messages.h"
 #include "tdb_compat.h"
 

diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index c2910f82c85ecb8ae1fb81e51a577f8a3c309ffd..ac1f4b0f4fb40748e77dc8e774b57bd157a03e3e 100644 (file)
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -66,7 +66,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "mangle.h"
 
 #if 1

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index bafd493f11c46a3aa63829ab415a8230ee2f453d..dd1e20a420501bad668701950a85d995fd68db0a 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -29,7 +29,7 @@
 #include "registry/reg_init_full.h"
 #include "libcli/auth/schannel.h"
 #include "secrets.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "ctdbd_conn.h"
 #include "util_cluster.h"
 #include "printing/queue_process.h"

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 92010c230ddfca8786f15da0d62acd700e186914..2f3b067012ecdaec829687b4e1bd4eb180d171ec 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "smbd/smbd.h"
 #include "messages.h"
 #include "smbprofile.h"

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index d5390ed0ca3e850f3e9423ce366c566464e18143..35740497d78047763b9e64a437f4700d5b4bf97e 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -27,7 +27,7 @@
 #include "system/filesys.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "transfer_file.h"
 #include "ntioctl.h"
 #include "lib/util/tevent_unix.h"

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index eb3958ea9cb6077b0228e0bba10f2a630e83fed2..ba23a853367185ad5b9a9301875720b9b214cf88 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -26,7 +26,7 @@
 #include "tldap.h"
 #include "tldap_util.h"
 #include "../librpc/gen_ndr/svcctl.h"
-#include "memcache.h"
+#include "../lib/util/memcache.h"
 #include "nsswitch/winbind_client.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"

diff --git a/source3/wscript_build b/source3/wscript_build
index 6f668bad371367c60e89dce163f3c9a5b158ee0d..38f0d12ef62d4a7a5bf520328da5e4bc86075d26 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -765,7 +765,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     deps='talloc samba3-util')
 
 bld.SAMBA3_LIBRARY('samba3-util',
-                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/namearray.c lib/file_id.c''',
+                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/namearray.c lib/file_id.c''',
                    deps='samba-util charset',
                    private_library=True)