From: Volker Lendecke <vl@samba.org>
Date: Tue, 3 Jan 2017 15:12:35 +0000 (+0000)
Subject: winbind: Remove wcache_lookup_usergroups
X-Git-Tag: samba-4.6.0rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=876dc28b9cf13343a2962b1a1b035fe78c1858a6;p=thirdparty%2Fsamba.git

winbind: Remove wcache_lookup_usergroups

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 6d30b45ed85..f5f7dc1085b 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2372,65 +2372,6 @@ NTSTATUS wcache_query_user_fullname(struct winbindd_domain *domain,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain,
-				  TALLOC_CTX *mem_ctx,
-				  const struct dom_sid *user_sid,
-				  uint32_t *pnum_sids,
-				  struct dom_sid **psids)
-{
-	struct winbind_cache *cache = get_cache(domain);
-	struct cache_entry *centry = NULL;
-	NTSTATUS status;
-	uint32_t i, num_sids;
-	struct dom_sid *sids;
-	fstring sid_string;
-
-	if (cache->tdb == NULL) {
-		return NT_STATUS_NOT_FOUND;
-	}
-
-	centry = wcache_fetch(cache, domain, "UG/%s",
-			      sid_to_fstring(sid_string, user_sid));
-	if (centry == NULL) {
-		return NT_STATUS_NOT_FOUND;
-	}
-
-	/* If we have an access denied cache entry and a cached info3 in the
-           samlogon cache then do a query.  This will force the rpc back end
-           to return the info3 data. */
-
-	if (NT_STATUS_EQUAL(domain->last_status, NT_STATUS_ACCESS_DENIED)
-	    && netsamlogon_cache_have(user_sid)) {
-		DEBUG(10, ("lookup_usergroups: cached access denied and have "
-			   "cached info3\n"));
-		domain->last_status = NT_STATUS_OK;
-		centry_free(centry);
-		return NT_STATUS_NOT_FOUND;
-	}
-
-	num_sids = centry_uint32(centry);
-	sids = talloc_array(mem_ctx, struct dom_sid, num_sids);
-	if (sids == NULL) {
-		centry_free(centry);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	for (i=0; i<num_sids; i++) {
-		centry_sid(centry, &sids[i]);
-	}
-
-	status = centry->status;
-
-	DEBUG(10,("lookup_usergroups: [Cached] - cached info for domain %s "
-		  "status: %s\n", domain->name, nt_errstr(status)));
-
-	centry_free(centry);
-
-	*pnum_sids = num_sids;
-	*psids = sids;
-	return status;
-}
-
 static char *wcache_make_sidlist(TALLOC_CTX *mem_ctx, uint32_t num_sids,
 				 const struct dom_sid *sids)
 {
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index e4d1aff8338..77bab4a1a90 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -170,11 +170,6 @@ NTSTATUS wcache_lookup_useraliases(struct winbindd_domain *domain,
 				   TALLOC_CTX *mem_ctx,
 				   uint32_t num_sids, const struct dom_sid *sids,
 				   uint32_t *pnum_aliases, uint32_t **paliases);
-NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain,
-				  TALLOC_CTX *mem_ctx,
-				  const struct dom_sid *user_sid,
-				  uint32_t *pnum_sids,
-				  struct dom_sid **psids);
 
 void wcache_flush_cache(void);
 NTSTATUS wcache_count_cached_creds(struct winbindd_domain *domain, int *count);