s3:passdb: do not use the in-memory idmap cache (it will be removed)

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index cfc78ad000eda6ab95052845633f5fd8841ed533..f544a3f678a909c34c74ac39015c42c6a23092fc 100644 (file)
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1012,115 +1012,6 @@ bool lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
  modified to use linked lists by jra.
 *****************************************************************/  
 
-/*****************************************************************
-  Find a SID given a uid.
-*****************************************************************/
-
-static bool fetch_sid_from_uid_cache(struct dom_sid *psid, uid_t uid)
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, UID_SID_CACHE,
-                            data_blob_const(&uid, sizeof(uid)),
-                            &cache_value)) {
-               return false;
-       }
-
-       memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length));
-       SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth));
-       SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0));
-
-       return true;
-}
-
-/*****************************************************************
-  Find a uid given a SID.
-*****************************************************************/
-
-static bool fetch_uid_from_cache( uid_t *puid, const struct dom_sid *psid )
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, SID_UID_CACHE,
-                            data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
-                            &cache_value)) {
-               return false;
-       }
-
-       SMB_ASSERT(cache_value.length == sizeof(*puid));
-       memcpy(puid, cache_value.data, sizeof(*puid));
-
-       return true;
-}
-
-/*****************************************************************
- Store uid to SID mapping in cache.
-*****************************************************************/
-
-void store_uid_sid_cache(const struct dom_sid *psid, uid_t uid)
-{
-       memcache_add(NULL, SID_UID_CACHE,
-                    data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
-                    data_blob_const(&uid, sizeof(uid)));
-       memcache_add(NULL, UID_SID_CACHE,
-                    data_blob_const(&uid, sizeof(uid)),
-                    data_blob_const(psid, ndr_size_dom_sid(psid, 0)));
-}
-
-/*****************************************************************
-  Find a SID given a gid.
-*****************************************************************/
-
-static bool fetch_sid_from_gid_cache(struct dom_sid *psid, gid_t gid)
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, GID_SID_CACHE,
-                            data_blob_const(&gid, sizeof(gid)),
-                            &cache_value)) {
-               return false;
-       }
-
-       memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length));
-       SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth));
-       SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0));
-
-       return true;
-}
-
-/*****************************************************************
-  Find a gid given a SID.
-*****************************************************************/
-
-static bool fetch_gid_from_cache(gid_t *pgid, const struct dom_sid *psid)
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, SID_GID_CACHE,
-                            data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
-                            &cache_value)) {
-               return false;
-       }
-
-       SMB_ASSERT(cache_value.length == sizeof(*pgid));
-       memcpy(pgid, cache_value.data, sizeof(*pgid));
-
-       return true;
-}
-
-/*****************************************************************
- Store gid to SID mapping in cache.
-*****************************************************************/
-
-void store_gid_sid_cache(const struct dom_sid *psid, gid_t gid)
-{
-       memcache_add(NULL, SID_GID_CACHE,
-                    data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
-                    data_blob_const(&gid, sizeof(gid)));
-       memcache_add(NULL, GID_SID_CACHE,
-                    data_blob_const(&gid, sizeof(gid)),
-                    data_blob_const(psid, ndr_size_dom_sid(psid, 0)));
-}
 
 /*****************************************************************
  *THE LEGACY* convert uid_t to SID function.
@@ -1149,7 +1040,6 @@ static void legacy_uid_to_sid(struct dom_sid *psid, uid_t uid)
        DEBUG(10,("LEGACY: uid %u -> sid %s\n", (unsigned int)uid,
                  sid_string_dbg(psid)));
 
-       store_uid_sid_cache(psid, uid);
        return;
 }
 
@@ -1180,7 +1070,6 @@ static void legacy_gid_to_sid(struct dom_sid *psid, gid_t gid)
        DEBUG(10,("LEGACY: gid %u -> sid %s\n", (unsigned int)gid,
                  sid_string_dbg(psid)));
 
-       store_gid_sid_cache(psid, gid);
        return;
 }
 
@@ -1223,7 +1112,6 @@ done:
        DEBUG(10,("LEGACY: sid %s -> uid %u\n", sid_string_dbg(psid),
                  (unsigned int)*puid ));
 
-       store_uid_sid_cache(psid, *puid);
        return true;
 }
 
@@ -1291,8 +1179,6 @@ static bool legacy_sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
        DEBUG(10,("LEGACY: sid %s -> gid %u\n", sid_string_dbg(psid),
                  (unsigned int)*pgid ));
 
-       store_gid_sid_cache(psid, *pgid);
-
        TALLOC_FREE(map);
        return true;
 }
@@ -1307,9 +1193,6 @@ void uid_to_sid(struct dom_sid *psid, uid_t uid)
        bool ret;
        ZERO_STRUCTP(psid);
 
-       if (fetch_sid_from_uid_cache(psid, uid))
-               return;
-
        /* Check the winbindd cache directly. */
        ret = idmap_cache_find_uid2sid(uid, psid, &expired);
 
@@ -1346,7 +1229,6 @@ void uid_to_sid(struct dom_sid *psid, uid_t uid)
        DEBUG(10,("uid %u -> sid %s\n", (unsigned int)uid,
                  sid_string_dbg(psid)));
 
-       store_uid_sid_cache(psid, uid);
        return;
 }
 
@@ -1360,9 +1242,6 @@ void gid_to_sid(struct dom_sid *psid, gid_t gid)
        bool ret;
        ZERO_STRUCTP(psid);
 
-       if (fetch_sid_from_gid_cache(psid, gid))
-               return;
-
        /* Check the winbindd cache directly. */
        ret = idmap_cache_find_gid2sid(gid, psid, &expired);
 
@@ -1399,7 +1278,6 @@ void gid_to_sid(struct dom_sid *psid, gid_t gid)
        DEBUG(10,("gid %u -> sid %s\n", (unsigned int)gid,
                  sid_string_dbg(psid)));
 
-       store_gid_sid_cache(psid, gid);
        return;
 }
 
@@ -1423,14 +1301,6 @@ bool sids_to_unix_ids(const struct dom_sid *sids, uint32_t num_sids,
                bool expired;
                uint32_t rid;
 
-               if (fetch_uid_from_cache(&ids[i].id.uid, &sids[i])) {
-                       ids[i].type = WBC_ID_TYPE_UID;
-                       continue;
-               }
-               if (fetch_gid_from_cache(&ids[i].id.gid, &sids[i])) {
-                       ids[i].type = WBC_ID_TYPE_GID;
-                       continue;
-               }
                if (sid_peek_check_rid(&global_sid_Unix_Users,
                                       &sids[i], &rid)) {
                        ids[i].type = WBC_ID_TYPE_UID;
@@ -1517,13 +1387,6 @@ bool sid_to_uid(const struct dom_sid *psid, uid_t *puid)
        uint32 rid;
        gid_t gid;
 
-       if (fetch_uid_from_cache(puid, psid))
-               return true;
-
-       if (fetch_gid_from_cache(&gid, psid)) {
-               return false;
-       }
-
        /* Optimize for the Unix Users Domain
         * as the conversion is straightforward */
        if (sid_peek_check_rid(&global_sid_Unix_Users, psid, &rid)) {
@@ -1563,7 +1426,6 @@ bool sid_to_uid(const struct dom_sid *psid, uid_t *puid)
        DEBUG(10,("sid %s -> uid %u\n", sid_string_dbg(psid),
                (unsigned int)*puid ));
 
-       store_uid_sid_cache(psid, *puid);
        return true;
 }
 
@@ -1579,12 +1441,6 @@ bool sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
        uint32 rid;
        uid_t uid;
 
-       if (fetch_gid_from_cache(pgid, psid))
-               return true;
-
-       if (fetch_uid_from_cache(&uid, psid))
-               return false;
-
        /* Optimize for the Unix Groups Domain
         * as the conversion is straightforward */
        if (sid_peek_check_rid(&global_sid_Unix_Groups, psid, &rid)) {
@@ -1625,7 +1481,6 @@ bool sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
        DEBUG(10,("sid %s -> gid %u\n", sid_string_dbg(psid),
                  (unsigned int)*pgid ));
 
-       store_gid_sid_cache(psid, *pgid);
        return true;
 }
 

diff --git a/source3/passdb/lookup_sid.h b/source3/passdb/lookup_sid.h
index c9f8dddfeac65ccbed323cbb3b6c07a4ad2e926a..693e001ad98439e3ced557050f1754dbe27d7dd2 100644 (file)
--- a/source3/passdb/lookup_sid.h
+++ b/source3/passdb/lookup_sid.h
@@ -80,8 +80,6 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
 bool lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
                const char **ret_domain, const char **ret_name,
                enum lsa_SidType *ret_type);
-void store_uid_sid_cache(const struct dom_sid *psid, uid_t uid);
-void store_gid_sid_cache(const struct dom_sid *psid, gid_t gid);
 void uid_to_sid(struct dom_sid *psid, uid_t uid);
 void gid_to_sid(struct dom_sid *psid, gid_t gid);
 bool sid_to_uid(const struct dom_sid *psid, uid_t *puid);

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 49f48bd212c7ef5753c9bb91cdedf922ec2aa597..d9e272ed6df1038d29604261ea8b879047178023 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1070,16 +1070,12 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
                        goto fn_exit;
                }
 
-               store_uid_sid_cache(pdb_get_user_sid(sampass),
-                                   sampass->unix_pw->pw_uid);
                idmap_cache_set_sid2uid(pdb_get_user_sid(sampass),
                                        sampass->unix_pw->pw_uid);
 
                gid_to_sid(&mapped_gsid, sampass->unix_pw->pw_gid);
                primary_gsid = pdb_get_group_sid(sampass);
                if (primary_gsid && dom_sid_equal(primary_gsid, &mapped_gsid)) {
-                       store_gid_sid_cache(primary_gsid,
-                                           sampass->unix_pw->pw_gid);
                        idmap_cache_set_sid2gid(primary_gsid,
                                                sampass->unix_pw->pw_gid);
                }
@@ -2479,7 +2475,6 @@ for gidNumber(%lu)\n",(unsigned long)map->gid));
        }
 
        if (lp_parm_bool(-1, "ldapsam", "trusted", false)) {
-               store_gid_sid_cache(&map->sid, map->gid);
                idmap_cache_set_sid2gid(&map->sid, map->gid);
        }
 
@@ -5040,7 +5035,6 @@ static bool ldapsam_sid_to_id(struct pdb_methods *methods,
 
                *gid = strtoul(gid_str, NULL, 10);
                *type = (enum lsa_SidType)strtoul(value, NULL, 10);
-               store_gid_sid_cache(sid, *gid);
                idmap_cache_set_sid2gid(sid, *gid);
                ret = True;
                goto done;
@@ -5058,7 +5052,6 @@ static bool ldapsam_sid_to_id(struct pdb_methods *methods,
 
        *uid = strtoul(value, NULL, 10);
        *type = SID_NAME_USER;
-       store_uid_sid_cache(sid, *uid);
        idmap_cache_set_sid2uid(sid, *uid);
 
        ret = True;
@@ -5129,7 +5122,6 @@ static bool ldapsam_uid_to_sid(struct pdb_methods *methods, uid_t uid,
 
        sid_copy(sid, &user_sid);
 
-       store_uid_sid_cache(sid, uid);
        idmap_cache_set_sid2uid(sid, uid);
 
        ret = true;
@@ -5199,7 +5191,6 @@ static bool ldapsam_gid_to_sid(struct pdb_methods *methods, gid_t gid,
 
        sid_copy(sid, &group_sid);
 
-       store_gid_sid_cache(sid, gid);
        idmap_cache_set_sid2gid(sid, gid);
 
        ret = true;