From 14e904fe868eb61e4ce39db14d156f384d086743 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 10 Mar 2006 13:36:39 +0000
Subject: r14148: Removing the not very well tested krb5 ticket refresh
 handling activated over --with-kcm. No time to look after it for the moment.

Guenther
(This used to be commit 7ec2b31a8790db1466ffafeab533c11ab7ea801a)
---
 source3/nsswitch/winbindd_ads.c        | 4 ----
 source3/nsswitch/winbindd_cred_cache.c | 3 ---
 source3/nsswitch/winbindd_pam.c        | 9 +--------
 3 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'source3/nsswitch')

diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 721c345aa5..179659f86f 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -59,11 +59,7 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
 	}
 
 	/* we don't want this to affect the users ccache */
-#ifdef WITH_KCM
-	setenv("KRB5CCNAME", "KCM:SYSTEM", 1);
-#else
 	setenv("KRB5CCNAME", "MEMORY:winbind_ccache", 1);
-#endif
 
 	ads = ads_init(domain->alt_name, domain->name, NULL);
 	if (!ads) {
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c
index 991718fb26..6835840a1d 100644
--- a/source3/nsswitch/winbindd_cred_cache.c
+++ b/source3/nsswitch/winbindd_cred_cache.c
@@ -228,8 +228,6 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 	new_entry->uid = uid;
 
 
-#ifndef WITH_KCM /* no point in doing the refresh in KCM and by ourself */
-
 	if (schedule_refresh_event && renew_until > 0) {
 
 		struct timeval t = timeval_set((ticket_end -1 ), 0);
@@ -240,7 +238,6 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 						   krb5_ticket_refresh_handler,
 						   new_entry);
 	}
-#endif /* WITH_KCM */
 
 	DLIST_ADD(ccache_list, new_entry);
 
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index f72c442e8b..754abad9e2 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -313,7 +313,7 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
 					uid_t uid,
 					BOOL *internal_ccache)
 {
-	/* accept KCM, FILE and WRFILE as krb5_cc_type from the client and then
+	/* accept FILE and WRFILE as krb5_cc_type from the client and then
 	 * build the full ccname string based on the user's uid here -
 	 * Guenther*/
 
@@ -333,10 +333,6 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
 		gen_cc = talloc_asprintf(mem_ctx, "FILE:/tmp/krb5cc_%d", uid);
 	} else if (strequal(type, "WRFILE")) {
 		gen_cc = talloc_asprintf(mem_ctx, "WRFILE:/tmp/krb5cc_%d", uid);
-#ifdef WITH_KCM
-	} else if (strequal(type, "KCM")) {
-		gen_cc = talloc_asprintf(mem_ctx, "KCM:%d", uid);
-#endif
 	} else {
 		DEBUG(10,("we don't allow to set a %s type ccache\n", type));
 		goto memory_ccache;
@@ -383,9 +379,6 @@ static void setup_return_cc_name(struct winbindd_cli_state *state, const char *c
 	}
 
 	if (!strequal(type, "FILE") &&
-#ifdef WITH_KCM
-	    !strequal(type, "KCM") &&
-#endif
 	    !strequal(type, "WRFILE")) {
 	    	DEBUG(10,("won't return krbccname for a %s type ccache\n", 
 			type));
-- 
cgit