From 983ad11a1c78949e86a0f51f51ef0d614cc5e665 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Sun, 5 Jun 2005 15:46:09 +0000
Subject: Resolve conflicts.

---
 crypto/openssh/auth-krb5.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'crypto/openssh/auth-krb5.c')

diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c
index acd2dda..a8c69fa 100644
--- a/crypto/openssh/auth-krb5.c
+++ b/crypto/openssh/auth-krb5.c
@@ -188,6 +188,11 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
 	snprintf(authctxt->krb5_ccname, len, "FILE:%s",
 	    authctxt->krb5_ticket_file);
 
+#ifdef USE_PAM
+	if (options.use_pam)
+		do_pam_putenv("KRB5CCNAME", authctxt->krb5_ccname);
+#endif
+
  out:
 	restore_uid();
 
-- 
cgit v1.1