Changeset 745 for trunk/server/source3/lib/idmap_cache.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/idmap_cache.c (modified) (2 diffs)

trunk/server/source3/lib/idmap_cache.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "idmap_cache.h"
+#include "../libcli/security/security.h"
 
 /**
@@ -259 +261 @@
         }
 }
+
+static char* key_xid2sid_str(TALLOC_CTX* mem_ctx, char t, const char* id) {
+        return talloc_asprintf(mem_ctx, "IDMAP/%cID2SID/%s", t, id);
+}
+
+static char* key_xid2sid(TALLOC_CTX* mem_ctx, char t, int id) {
+        char str[32];
+        snprintf(str, sizeof(str), "%d", id);
+        return key_xid2sid_str(mem_ctx, t, str);
+}
+
+static char* key_sid2xid_str(TALLOC_CTX* mem_ctx, char t, const char* sid) {
+        return talloc_asprintf(mem_ctx, "IDMAP/SID2%cID/%s", t, sid);
+}
+
+/* static char* key_sid2xid(TALLOC_CTX* mem_ctx, char t, const struct dom_sid* sid) */
+/* { */
+/*      char* sid_str = sid_string_talloc(mem_ctx, sid); */
+/*      char* key = key_sid2xid_str(mem_ctx, t, sid_str); */
+/*      talloc_free(sid_str); */
+/*      return key; */
+/* } */
+
+static bool idmap_cache_del_xid(char t, int xid)
+{
+        TALLOC_CTX* mem_ctx = talloc_stackframe();
+        const char* key = key_xid2sid(mem_ctx, t, xid);
+        char* sid_str = NULL;
+        time_t timeout;
+        bool ret = true;
+
+        if (!gencache_get(key, &sid_str, &timeout)) {
+                DEBUG(3, ("no entry: %s\n", key));
+                ret = false;
+                goto done;
+        }
+
+        if (sid_str[0] != '-') {
+                const char* sid_key = key_sid2xid_str(mem_ctx, t, sid_str);
+                if (!gencache_del(sid_key)) {
+                        DEBUG(2, ("failed to delete: %s\n", sid_key));
+                        ret = false;
+                } else {
+                        DEBUG(5, ("delete: %s\n", sid_key));
+                }
+
+        }
+
+        if (!gencache_del(key)) {
+                DEBUG(1, ("failed to delete: %s\n", key));
+                ret = false;
+        } else {
+                DEBUG(5, ("delete: %s\n", key));
+        }
+
+done:
+        talloc_free(mem_ctx);
+        return ret;
+}
+
+bool idmap_cache_del_uid(uid_t uid) {
+        return idmap_cache_del_xid('U', uid);
+}
+
+bool idmap_cache_del_gid(gid_t gid) {
+        return idmap_cache_del_xid('G', gid);
+}
+
+static bool idmap_cache_del_sid2xid(TALLOC_CTX* mem_ctx, char t, const char* sid)
+{
+        const char* sid_key = key_sid2xid_str(mem_ctx, t, sid);
+        char* xid_str;
+        time_t timeout;
+        bool ret = true;
+
+        if (!gencache_get(sid_key, &xid_str, &timeout)) {
+                ret = false;
+                goto done;
+        }
+
+        if (atoi(xid_str) != -1) {
+                const char* xid_key = key_xid2sid_str(mem_ctx, t, xid_str);
+                if (!gencache_del(xid_key)) {
+                        DEBUG(2, ("failed to delete: %s\n", xid_key));
+                        ret = false;
+                } else {
+                        DEBUG(5, ("delete: %s\n", xid_key));
+                }
+        }
+
+        if (!gencache_del(sid_key)) {
+                DEBUG(2, ("failed to delete: %s\n", sid_key));
+                ret = false;
+        } else {
+                DEBUG(5, ("delete: %s\n", sid_key));
+        }
+done:
+        return ret;
+}
+
+bool idmap_cache_del_sid(const struct dom_sid *sid)
+{
+        TALLOC_CTX* mem_ctx = talloc_stackframe();
+        const char* sid_str = sid_string_talloc(mem_ctx, sid);
+        bool ret = true;
+
+        if (!idmap_cache_del_sid2xid(mem_ctx, 'U', sid_str) &&
+            !idmap_cache_del_sid2xid(mem_ctx, 'G', sid_str))
+        {
+                DEBUG(3, ("no entry: %s\n", key_xid2sid_str(mem_ctx, '?', sid_str)));
+                ret = false;
+        }
+
+        talloc_free(mem_ctx);
+        return ret;
+}