From 45807028d478c082fef6f3a3d5a142d96d63fb50 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 17 Jul 2014 12:58:34 +0200 Subject: [PATCH] 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 Reviewed-by: Volker Lendecke Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Fri Jul 18 15:43:33 CEST 2014 on sn-devel-104 --- {source3/lib => lib/util}/memcache.c | 0 {source3/include => lib/util}/memcache.h | 0 lib/util/wscript_build | 2 +- source3/auth/token_util.c | 2 +- source3/lib/access.c | 2 +- source3/lib/gencache.c | 2 +- source3/lib/id_cache.c | 2 +- source3/lib/username.c | 2 +- source3/lib/util_sock.c | 2 +- source3/passdb/lookup_sid.c | 2 +- source3/passdb/pdb_interface.c | 2 +- source3/smbd/dir.c | 2 +- source3/smbd/globals.c | 2 +- source3/smbd/mangle_hash2.c | 2 +- source3/smbd/server.c | 2 +- source3/smbd/statcache.c | 2 +- source3/smbd/vfs.c | 2 +- source3/torture/torture.c | 2 +- source3/wscript_build | 2 +- 19 files changed, 17 insertions(+), 17 deletions(-) rename {source3/lib => lib/util}/memcache.c (100%) rename {source3/include => lib/util}/memcache.h (100%) 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 fe2c1833923..bcb7b66c771 100755 --- 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 8b0174fc44c..9bb014c32cd 100644 --- 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 a2de35caf49..58db722706a 100644 --- 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 0fb1fd8280e..3e67d9ebe75 100644 --- 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 e6e345741c1..3a703ae4af3 100644 --- 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 847aa33eab1..f69d9c3bf22 100644 --- 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 c5de61a094b..522f6002bc6 100644 --- 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 fa44f3efbd0..5f24d7844ae 100644 --- 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 2c82856bc0a..ed42961435d 100644 --- 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 818f77895e4..55d774278bc 100644 --- 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 3eb65a13200..e03c7c4180b 100644 --- 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 c2910f82c85..ac1f4b0f4fb 100644 --- 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 bafd493f11c..dd1e20a4205 100644 --- 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 92010c230dd..2f3b067012e 100644 --- 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 d5390ed0ca3..35740497d78 100644 --- 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 eb3958ea9cb..ba23a853367 100644 --- 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 6f668bad371..38f0d12ef62 100755 --- 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) -- 2.11.4.GIT