consolidate idmap code in one place

(This used to be commit f7041ec5d74475013c839b5ea9ecac10322e5e65)

3 files changed, 4 insertions, 353 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7cb7f16afb..5bcb6f629f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -288,7 +288,7 @@ DEVEL_HELP_OBJ = modules/developer.o
 
 SAM_STATIC_MODULES = sam/sam_plugin.o sam/sam_skel.o sam/sam_ads.o
 
-IDMAP_OBJ = sam/idmap.o sam/idmap_tdb.o
+IDMAP_OBJ = sam/idmap.o sam/idmap_util.o sam/idmap_tdb.o
 
 SAM_OBJ = sam/account.o sam/get_set_account.o sam/get_set_group.o \
 		sam/get_set_domain.o sam/interface.o $(SAM_STATIC_MODULES)
@@ -604,11 +604,11 @@ WINBINDD_OBJ1 = \
 		nsswitch/winbindd_dual.o
 
 WINBINDD_OBJ = \
-		$(WINBINDD_OBJ1) $(PASSDB_GET_SET_OBJ) \
+		$(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 		$(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
 		$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) \
 		$(PROFILE_OBJ) $(UNIGRP_OBJ) $(IDMAP_OBJ) \
-		$(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) @LDAP_OBJ@
+		$(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ)
 
 WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o $(POPT_LIB_OBJ)
 
diff --git a/source3/sam/idmap.c b/source3/sam/idmap.c
index 45a1d324b1..e3747d0700 100644
--- a/source3/sam/idmap.c
+++ b/source3/sam/idmap.c
@@ -1,6 +1,6 @@
 /* 
    Unix SMB/CIFS implementation.
-   Winbind ID Mapping
+   ID Mapping
    Copyright (C) Tim Potter 2000
    Copyright (C) Anthony Liguori <aliguor@us.ibm.com>	2003
    Copyright (C) Simo Sorce 2003
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 353ae8f50d..f33235cdff 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -530,352 +530,3 @@ BOOL lookup_sid(DOM_SID *sid, fstring dom_name, fstring name, enum SID_NAME_USE
 	}
 	return True;
 }
-
-/*****************************************************************
- Id mapping cache.  This is to avoid Winbind mappings already
- seen by smbd to be queried too frequently, keeping winbindd
- busy, and blocking smbd while winbindd is busy with other
- stuff. Written by Michael Steffens <michael.steffens@hp.com>,
- modified to use linked lists by jra.
-*****************************************************************/  
-
-#define MAX_UID_SID_CACHE_SIZE 100
-#define TURNOVER_UID_SID_CACHE_SIZE 10
-#define MAX_GID_SID_CACHE_SIZE 100
-#define TURNOVER_GID_SID_CACHE_SIZE 10
-
-static size_t n_uid_sid_cache = 0;
-static size_t n_gid_sid_cache = 0;
-
-static struct uid_sid_cache {
-	struct uid_sid_cache *next, *prev;
-	uid_t uid;
-	DOM_SID sid;
-	enum SID_NAME_USE sidtype;
-} *uid_sid_cache_head;
-
-static struct gid_sid_cache {
-	struct gid_sid_cache *next, *prev;
-	gid_t gid;
-	DOM_SID sid;
-	enum SID_NAME_USE sidtype;
-} *gid_sid_cache_head;
-
-/*****************************************************************
-  Find a SID given a uid.
-*****************************************************************/  
-
-static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, enum SID_NAME_USE *psidtype, uid_t uid)
-{
-	struct uid_sid_cache *pc;
-
-	for (pc = uid_sid_cache_head; pc; pc = pc->next) {
-		if (pc->uid == uid) {
-			fstring sid;
-			*psid = pc->sid;
-			*psidtype = pc->sidtype;
-			DEBUG(3,("fetch sid from uid cache %u -> %s\n",
-				(unsigned int)uid, sid_to_string(sid, psid)));
-			DLIST_PROMOTE(uid_sid_cache_head, pc);
-			return True;
-		}
-	}
-	return False;
-}
-
-/*****************************************************************
-  Find a uid given a SID.
-*****************************************************************/  
-
-static BOOL fetch_uid_from_cache(uid_t *puid, const DOM_SID *psid, enum SID_NAME_USE sidtype)
-{
-	struct uid_sid_cache *pc;
-
-	for (pc = uid_sid_cache_head; pc; pc = pc->next) {
-		if (sid_compare(&pc->sid, psid) == 0) {
-			fstring sid;
-			*puid = pc->uid;
-			DEBUG(3,("fetch uid from cache %u -> %s\n",
-				(unsigned int)*puid, sid_to_string(sid, psid)));
-			DLIST_PROMOTE(uid_sid_cache_head, pc);
-			return True;
-		}
-	}
-	return False;
-}
-
-/*****************************************************************
- Store uid to SID mapping in cache.
-*****************************************************************/  
-
-static void store_uid_sid_cache(const DOM_SID *psid, const enum SID_NAME_USE sidtype, uid_t uid)
-{
-	struct uid_sid_cache *pc;
-
-	if (n_uid_sid_cache >= MAX_UID_SID_CACHE_SIZE && n_uid_sid_cache > TURNOVER_UID_SID_CACHE_SIZE) {
-		/* Delete the last TURNOVER_UID_SID_CACHE_SIZE entries. */
-		struct uid_sid_cache *pc_next;
-		size_t i;
-
-		for (i = 0, pc = uid_sid_cache_head; i < (n_uid_sid_cache - TURNOVER_UID_SID_CACHE_SIZE); i++, pc = pc->next)
-			;
-		for(; pc; pc = pc_next) {
-			pc_next = pc->next;
-			DLIST_REMOVE(uid_sid_cache_head,pc);
-			SAFE_FREE(pc);
-			n_uid_sid_cache--;
-		}
-	}
-
-	pc = (struct uid_sid_cache *)malloc(sizeof(struct uid_sid_cache));
-	if (!pc)
-		return;
-	pc->uid = uid;
-	sid_copy(&pc->sid, psid);
-	pc->sidtype = sidtype;
-	DLIST_ADD(uid_sid_cache_head, pc);
-	n_uid_sid_cache++;
-}
-
-/*****************************************************************
-  Find a SID given a gid.
-*****************************************************************/  
-
-static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, enum SID_NAME_USE *psidtype, gid_t gid)
-{
-	struct gid_sid_cache *pc;
-
-	for (pc = gid_sid_cache_head; pc; pc = pc->next) {
-		if (pc->gid == gid) {
-			fstring sid;
-			*psid = pc->sid;
-			*psidtype = pc->sidtype;
-			DEBUG(3,("fetch sid from gid cache %u -> %s\n",
-				(unsigned int)gid, sid_to_string(sid, psid)));
-			DLIST_PROMOTE(gid_sid_cache_head, pc);
-			return True;
-		}
-	}
-	return False;
-}
-
-/*****************************************************************
-  Find a gid given a SID.
-*****************************************************************/  
-
-static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid, enum SID_NAME_USE sidtype)
-{
-	struct gid_sid_cache *pc;
-
-	for (pc = gid_sid_cache_head; pc; pc = pc->next) {
-		if (sid_compare(&pc->sid, psid) == 0) {
-			fstring sid;
-			*pgid = pc->gid;
-			DEBUG(3,("fetch uid from cache %u -> %s\n",
-				(unsigned int)*pgid, sid_to_string(sid, psid)));
-			DLIST_PROMOTE(gid_sid_cache_head, pc);
-			return True;
-		}
-	}
-	return False;
-}
-
-/*****************************************************************
- Store gid to SID mapping in cache.
-*****************************************************************/  
-
-static void store_gid_sid_cache(const DOM_SID *psid, const enum SID_NAME_USE sidtype, gid_t gid)
-{
-	struct gid_sid_cache *pc;
-
-	if (n_gid_sid_cache >= MAX_GID_SID_CACHE_SIZE && n_gid_sid_cache > TURNOVER_GID_SID_CACHE_SIZE) {
-		/* Delete the last TURNOVER_GID_SID_CACHE_SIZE entries. */
-		struct gid_sid_cache *pc_next;
-		size_t i;
-
-		for (i = 0, pc = gid_sid_cache_head; i < (n_gid_sid_cache - TURNOVER_GID_SID_CACHE_SIZE); i++, pc = pc->next)
-			;
-		for(; pc; pc = pc_next) {
-			pc_next = pc->next;
-			DLIST_REMOVE(gid_sid_cache_head,pc);
-			SAFE_FREE(pc);
-			n_gid_sid_cache--;
-		}
-	}
-
-	pc = (struct gid_sid_cache *)malloc(sizeof(struct gid_sid_cache));
-	if (!pc)
-		return;
-	pc->gid = gid;
-	sid_copy(&pc->sid, psid);
-	pc->sidtype = sidtype;
-	DLIST_ADD(gid_sid_cache_head, pc);
-	n_gid_sid_cache++;
-}
-
-
-/*****************************************************************
- *THE CANONICAL* convert uid_t to SID function.
- Tries winbind first - then uses local lookup.
- Returns SID pointer.
-*****************************************************************/  
-
-DOM_SID *uid_to_sid(DOM_SID *psid, uid_t uid)
-{
-	unid_t id;
-
-	DEBUG(10,("uid_to_sid: uid = [%d]\n", uid));
-
-	id.uid = uid;
-	if (NT_STATUS_IS_OK(idmap_get_sid_from_id(psid, id, ID_USERID))) {
-		DEBUG(10, ("uid_to_sid: sid = [%s]\n", sid_string_static(psid)));
-		return psid;
-	}
-
-	/* If mapping is not found in idmap try with traditional method,
-	   then stores the result in idmap.
-	   We may add a switch in future to allow smooth migrations to
-	   idmap-only db  ---Simo */	
-
-	sid_copy(psid, get_global_sam_sid());
-	sid_append_rid(psid, fallback_pdb_uid_to_user_rid(uid));
-
-	DEBUG(10,("uid_to_sid: algorithmic %u -> %s\n", (unsigned int)uid, sid_string_static(psid)));
-
-	return psid;
-	
-}
-
-/*****************************************************************
- *THE CANONICAL* convert gid_t to SID function.
- Tries winbind first - then uses local lookup.
- Returns SID pointer.
-*****************************************************************/  
-
-DOM_SID *gid_to_sid(DOM_SID *psid, gid_t gid)
-{
-	GROUP_MAP map;
-	unid_t id;
-
-	DEBUG(10,("gid_to_sid: gid = [%d]\n", gid));
-
-		id.gid = gid;
-	if (NT_STATUS_IS_OK(idmap_get_sid_from_id(psid, id, ID_GROUPID))) {
-		DEBUG(10, ("gid_to_sid: sid = [%s]\n", sid_string_static(psid)));
-		return psid;
-	}
-
-	/* If mapping is not found in idmap try with traditional method,
-	   then stores the result in idmap.
-	   We may add a switch in future to allow smooth migrations to
-	   idmap-only db  ---Simo */	
-
-	if (pdb_getgrgid(&map, gid, MAPPING_WITHOUT_PRIV)) {
-		sid_copy(psid, &map.sid);
-	} else {
-		sid_copy(psid, get_global_sam_sid());
-		sid_append_rid(psid, pdb_gid_to_group_rid(gid));
-	}
-
-	DEBUG(10,("gid_to_sid: algorithmic %u -> %s\n", (unsigned int)gid, sid_string_static(psid)));
-
-	return psid;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert SID to uid function.
- Tries winbind first - then uses local lookup.
- Returns True if this name is a user sid and the conversion
- was done correctly, False if not. sidtype is set by this function.
-*****************************************************************/  
-
-BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid, enum SID_NAME_USE *sidtype)
-{
-	unid_t id;
-	int type;
-
-	DEBUG(10,("sid_to_uid: sid = [%s]\n", sid_string_static(psid)));
-
-	*sidtype = SID_NAME_USER;
-
-	type = ID_USERID;
-	if (NT_STATUS_IS_OK(idmap_get_id_from_sid(&id, &type, psid))) {
-		DEBUG(10,("sid_to_uid: uid = [%d]\n", id.uid));
-		*puid = id.uid;
-		return True;
-	}
-
-	if (sid_compare_domain(get_global_sam_sid(), psid) == 0) {
-		BOOL result;
-		uint32 rid;
-
-		DEBUG(10,("sid_to_uid: sid is local [%s]\n", sid_string_static(get_global_sam_sid())));
-
-		if (!sid_peek_rid(psid, &rid)) {
-			DEBUG(0, ("sid_to_uid: Error extracting RID from SID\n!"));
-			return False;
-		}
-		if (!pdb_rid_is_user(rid)) {
-			DEBUG(3, ("sid_to_uid: RID %u is *NOT* a user\n", (unsigned)rid));
-			return False;
-		}
-		*puid = fallback_pdb_user_rid_to_uid(rid);
-		return True;
-	}
-	return False;
-}
-
-/*****************************************************************
- *THE CANONICAL* convert SID to gid function.
- Tries winbind first - then uses local lookup.
- Returns True if this name is a user sid and the conversion
- was done correctly, False if not.
-*****************************************************************/  
-
-BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid, enum SID_NAME_USE *sidtype)
-{
-	unid_t id;
-	int type;
-
-	DEBUG(10,("sid_to_gid: sid = [%s]\n", sid_string_static(psid)));
-
-	*sidtype = SID_NAME_ALIAS;
-
-	type = ID_GROUPID;
-	if (NT_STATUS_IS_OK(idmap_get_id_from_sid(&id, &type, psid))) {
-		DEBUG(10,("sid_to_gid: gid = [%d]\n", id.gid));
-		*pgid = id.gid;
-		return True;
-	}
-
-	if (sid_compare_domain(get_global_sam_sid(), psid) == 0) {
-		GROUP_MAP map;
-		BOOL result;
-
-		if (pdb_getgrsid(&map, *psid, MAPPING_WITHOUT_PRIV)) {
-			/* the SID is in the mapping table but not mapped */
-			if (map.gid==(gid_t)-1)
-				return False;
-			
-			*pgid = map.gid;
-			*sidtype = map.sid_name_use;
-			return True;
-		} else {
-			uint32 rid;
-
-			if (!sid_peek_rid(psid, &rid)) {
-				DEBUG(0, ("sid_to_gid: Error extracting RID from SID\n!"));
-				return False;
-			}
-			if (pdb_rid_is_user(rid)) {
-				DEBUG(3, ("sid_to_gid: RID %u is *NOT* a group\n", (unsigned)rid));
-				return False;
-			}
-			*pgid = pdb_group_rid_to_gid(rid);
-			*sidtype = SID_NAME_ALIAS;	
-		}
-	}
-
-	return False;
-}
-