svn commit: samba r12418 - in trunk/source/nsswitch: .

[gd at samba.org]

Author: gd
Date: 2005-12-22 01:07:56 +0000 (Thu, 22 Dec 2005)
New Revision: 12418

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12418

Log:
Don't add an internal ccache to the refresh queue.

Guenther

Modified:
   trunk/source/nsswitch/winbindd_pam.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2005-12-22 00:03:30 UTC (rev 12417)
+++ trunk/source/nsswitch/winbindd_pam.c	2005-12-22 01:07:56 UTC (rev 12418)
@@ -374,16 +374,12 @@
 	return uid;
 }
 
-static void setup_return_cc_name(struct winbindd_cli_state *state, const char *cc, BOOL internal_ccache)
+static void setup_return_cc_name(struct winbindd_cli_state *state, const char *cc)
 {
 	const char *type = state->request.data.auth.krb5_cc_type;
 
 	state->response.data.auth.krb5ccname[0] = '\0';
 
-	if (internal_ccache) {
-		return;
-	}
-
 	if (type[0] == '\0') {
 		return;
 	}
@@ -587,23 +583,27 @@
 
 	/* if we had a user's ccache then return that string for the pam
 	 * environment */
-	setup_return_cc_name(state, cc, internal_ccache);
 
-	result = add_ccache_to_list(principal_s,
-				    cc,
-				    service,
-				    state->request.data.auth.user,
-				    NULL,
-				    state->request.data.auth.pass,
-				    uid,
-				    time(NULL),
-				    ticket_lifetime,
-				    renewal_until, 
-				    lp_winbind_refresh_tickets());
+	if (!internal_ccache) {
+		
+		setup_return_cc_name(state, cc);
 
-	if (!NT_STATUS_IS_OK(result)) {
-		DEBUG(10,("winbindd_raw_kerberos_login: failed to add ccache to list: %s\n", 
-			nt_errstr(result)));
+		result = add_ccache_to_list(principal_s,
+					    cc,
+					    service,
+					    state->request.data.auth.user,
+					    NULL,
+					    state->request.data.auth.pass,
+					    uid,
+					    time(NULL),
+					    ticket_lifetime,
+					    renewal_until, 
+					    lp_winbind_refresh_tickets());
+
+		if (!NT_STATUS_IS_OK(result)) {
+			DEBUG(10,("winbindd_raw_kerberos_login: failed to add ccache to list: %s\n", 
+				nt_errstr(result)));
+		}
 	}
 
 	result = NT_STATUS_OK;
@@ -1766,7 +1766,7 @@
 	}
 
 	if (!strcsequal(entry->ccname, state->request.data.logoff.krb5ccname)) {
-		DEBUG(0,("winbindd_pam_logoff: krb5ccnames differ: %s != %s\n", 
+		DEBUG(0,("winbindd_pam_logoff: krb5ccnames differ: (daemon) %s != (client) %s\n", 
 			entry->ccname, state->request.data.logoff.krb5ccname));
 		goto process_result;
 	}