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

[nivanova/samba-autobuild/.git] / source3 / lib / id_cache.c

diff --git a/source3/lib/id_cache.c b/source3/lib/id_cache.c
index e71934d6e3cb010f5c418b0195e92e878042b28c..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"
@@ -64,58 +64,6 @@ bool id_cache_ref_parse(const char* str, struct id_cache_ref* id)
        return false;
 }
 
-static bool delete_uid_cache(uid_t puid)
-{
-       DATA_BLOB uid = data_blob_const(&puid, sizeof(puid));
-       DATA_BLOB sid;
-
-       if (!memcache_lookup(NULL, UID_SID_CACHE, uid, &sid)) {
-               DEBUG(3, ("UID %d is not memcached!\n", (int)puid));
-               return false;
-       }
-       DEBUG(3, ("Delete mapping UID %d <-> %s from memcache\n", (int)puid,
-                 sid_string_dbg((struct dom_sid*)sid.data)));
-       memcache_delete(NULL, SID_UID_CACHE, sid);
-       memcache_delete(NULL, UID_SID_CACHE, uid);
-       return true;
-}
-
-static bool delete_gid_cache(gid_t pgid)
-{
-       DATA_BLOB gid = data_blob_const(&pgid, sizeof(pgid));
-       DATA_BLOB sid;
-       if (!memcache_lookup(NULL, GID_SID_CACHE, gid, &sid)) {
-               DEBUG(3, ("GID %d is not memcached!\n", (int)pgid));
-               return false;
-       }
-       DEBUG(3, ("Delete mapping GID %d <-> %s from memcache\n", (int)pgid,
-                 sid_string_dbg((struct dom_sid*)sid.data)));
-       memcache_delete(NULL, SID_GID_CACHE, sid);
-       memcache_delete(NULL, GID_SID_CACHE, gid);
-       return true;
-}
-
-static bool delete_sid_cache(const struct dom_sid* psid)
-{
-       DATA_BLOB sid = data_blob_const(psid, ndr_size_dom_sid(psid, 0));
-       DATA_BLOB id;
-       if (memcache_lookup(NULL, SID_GID_CACHE, sid, &id)) {
-               DEBUG(3, ("Delete mapping %s <-> GID %d from memcache\n",
-                         sid_string_dbg(psid), *(int*)id.data));
-               memcache_delete(NULL, SID_GID_CACHE, sid);
-               memcache_delete(NULL, GID_SID_CACHE, id);
-       } else if (memcache_lookup(NULL, SID_UID_CACHE, sid, &id)) {
-               DEBUG(3, ("Delete mapping %s <-> UID %d from memcache\n",
-                         sid_string_dbg(psid), *(int*)id.data));
-               memcache_delete(NULL, SID_UID_CACHE, sid);
-               memcache_delete(NULL, UID_SID_CACHE, id);
-       } else {
-               DEBUG(3, ("SID %s is not memcached!\n", sid_string_dbg(psid)));
-               return false;
-       }
-       return true;
-}
-
 static bool delete_getpwnam_cache(const char *username)
 {
        DATA_BLOB name = data_blob_string_const_null(username);
@@ -125,32 +73,16 @@ static bool delete_getpwnam_cache(const char *username)
        return true;
 }
 
-static void flush_gid_cache(void)
-{
-       DEBUG(3, ("Flush GID <-> SID memcache\n"));
-       memcache_flush(NULL, SID_GID_CACHE);
-       memcache_flush(NULL, GID_SID_CACHE);
-}
-
-static void flush_uid_cache(void)
-{
-       DEBUG(3, ("Flush UID <-> SID memcache\n"));
-       memcache_flush(NULL, SID_UID_CACHE);
-       memcache_flush(NULL, UID_SID_CACHE);
-}
 void id_cache_delete_from_cache(const struct id_cache_ref* id)
 {
        switch(id->type) {
        case UID:
-               delete_uid_cache(id->id.uid);
                idmap_cache_del_uid(id->id.uid);
                break;
        case GID:
-               delete_gid_cache(id->id.gid);
                idmap_cache_del_gid(id->id.gid);
                break;
        case SID:
-               delete_sid_cache(&id->id.sid);
                idmap_cache_del_sid(&id->id.sid);
                break;
        case USERNAME:
@@ -160,32 +92,11 @@ void id_cache_delete_from_cache(const struct id_cache_ref* id)
        }
 }
 
-
-static void id_cache_flush(struct messaging_context *msg_ctx,
-                          void* private_data,
-                          uint32_t msg_type,
-                          struct server_id server_id,
-                          DATA_BLOB* data)
-{
-       const char *msg = data ? (const char *)data->data : NULL;
-
-       if ((msg == NULL) || (msg[0] == '\0')) {
-               flush_gid_cache();
-               flush_uid_cache();
-       } else if (strncmp(msg, "GID", 3)) {
-               flush_gid_cache();
-       } else if (strncmp(msg, "UID", 3)) {
-               flush_uid_cache();
-       } else {
-               DEBUG(0, ("Invalid argument: %s\n", msg));
-       }
-}
-
-static void id_cache_delete(struct messaging_context *msg_ctx,
-                           void *private_data,
-                           uint32_t msg_type,
-                           struct server_id server_id,
-                           DATA_BLOB* data)
+void id_cache_delete_message(struct messaging_context *msg_ctx,
+                            void *private_data,
+                            uint32_t msg_type,
+                            struct server_id server_id,
+                            DATA_BLOB* data)
 {
        const char *msg = (data && data->data) ? (const char *)data->data : "<NULL>";
        struct id_cache_ref id;
@@ -200,6 +111,5 @@ static void id_cache_delete(struct messaging_context *msg_ctx,
 
 void id_cache_register_msgs(struct messaging_context *ctx)
 {
-       messaging_register(ctx, NULL, ID_CACHE_FLUSH,  id_cache_flush);
-       messaging_register(ctx, NULL, ID_CACHE_DELETE, id_cache_delete);
+       messaging_register(ctx, NULL, ID_CACHE_DELETE, id_cache_delete_message);
 }