Index: auth-krb5.c
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth-krb5.c,v
retrieving revision 1.22
diff -u -p -r1.22 auth-krb5.c
--- auth-krb5.c	7 Apr 2004 04:16:11 -0000	1.22
+++ auth-krb5.c	16 Apr 2004 06:30:54 -0000
@@ -163,6 +163,7 @@ auth_krb5_password(Authctxt *authctxt, c
 	problem = krb5_cc_resolve(authctxt->krb5_ctx, ccname, &authctxt->krb5_fwd_ccache);
 	if (problem)
 		goto out;
+	authctxt->krb5_ccname = xstrdup(ccname);
 
 	problem = krb5_cc_initialize(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache,
 				     authctxt->krb5_user);
Index: auth.h
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth.h,v
retrieving revision 1.60
diff -u -p -r1.60 auth.h
--- auth.h	21 Feb 2004 23:22:05 -0000	1.60
+++ auth.h	16 Apr 2004 06:29:20 -0000
@@ -66,6 +66,7 @@ struct Authctxt {
 	krb5_ccache	 krb5_fwd_ccache;
 	krb5_principal	 krb5_user;
 	char		*krb5_ticket_file;
+	char		*krb5_ccname;
 #endif
 	void		*methoddata;
 };
Index: session.c
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/session.c,v
retrieving revision 1.277
diff -u -p -r1.277 session.c
--- session.c	6 Apr 2004 22:04:10 -0000	1.277
+++ session.c	16 Apr 2004 06:38:10 -0000
@@ -1093,9 +1093,9 @@ do_setup_env(Session *s, const char *she
 	}
 #endif
 #ifdef KRB5
-	if (s->authctxt->krb5_ticket_file)
+	if (s->authctxt->krb5_ccname)
 		child_set_env(&env, &envsize, "KRB5CCNAME",
-		    s->authctxt->krb5_ticket_file);
+		    s->authctxt->krb5_ccname);
 #endif
 #ifdef USE_PAM
 	/*
