Merge 4.0p1 to the trunk.

1 files changed, 5 insertions, 0 deletions

diff --git a/auth-krb5.c b/auth-krb5.c
index a324ff15c..2f742534a 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -187,6 +187,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();