From: Volker Lendecke <vl@samba.org>
Date: Tue, 3 Jan 2017 15:13:50 +0000 (+0000)
Subject: winbind: Remove validate_ug
X-Git-Tag: samba-4.6.0rc1~13
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=3f58a8cabab75a594cff9088d5dd8ea439b36178;p=samba.git

winbind: Remove validate_ug

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 f5f7dc1085b..d8a49c7015f 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2969,11 +2969,6 @@ void wcache_invalidate_samlogon(struct winbindd_domain *domain,
 	DEBUG(10, ("wcache_invalidate_samlogon: clearing %s\n", key_str));
 	tdb_delete(cache->tdb, string_tdb_data(key_str));
 
-	/* Clear UG/SID cache entry */
-	fstr_sprintf(key_str, "UG/%s", sid_to_fstring(sid_string, sid));
-	DEBUG(10, ("wcache_invalidate_samlogon: clearing %s\n", key_str));
-	tdb_delete(cache->tdb, string_tdb_data(key_str));
-
 	/* Samba/winbindd never needs this. */
 	netsamlogon_clear_cached_user(sid);
 }
@@ -3746,32 +3741,6 @@ static int validate_gl(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
 	return 0;
 }
 
-static int validate_ug(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
-		       struct tdb_validation_status *state)
-{
-	struct cache_entry *centry = create_centry_validate(keystr, dbuf, state);
-	int32_t num_groups, i;
-
-	if (!centry) {
-		return 1;
-	}
-
-	num_groups = centry_uint32(centry);
-
-	for (i=0; i< num_groups; i++) {
-		struct dom_sid sid;
-		centry_sid(centry, &sid);
-	}
-
-	centry_free(centry);
-
-	if (!(state->success)) {
-		return 1;
-	}
-	DEBUG(10,("validate_ug: %s ok\n", keystr));
-	return 0;
-}
-
 static int validate_ua(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf,
 		       struct tdb_validation_status *state)
 {
@@ -3997,7 +3966,6 @@ struct key_val_struct {
 	{"CRED/", validate_cred},
 	{"UL/", validate_ul},
 	{"GL/", validate_gl},
-	{"UG/", validate_ug},
 	{"UA", validate_ua},
 	{"GM/", validate_gm},
 	{"DR/", validate_dr},