summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--auth-krb5.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 750751fb5..995e1bd27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
13 - (dtucker) [session.c] Bug #927: make .hushlogin silent again. ok djm@ 13 - (dtucker) [session.c] Bug #927: make .hushlogin silent again. ok djm@
14 - (dtucker) [configure.ac] Bug #321: Add cross-compile support to configure. 14 - (dtucker) [configure.ac] Bug #321: Add cross-compile support to configure.
15 Parts by chua at ayrnetworks.com, astrand at lysator.liu.se and me. ok djm@ 15 Parts by chua at ayrnetworks.com, astrand at lysator.liu.se and me. ok djm@
16 - (dtucker) [auth-krb5.c] Bug #922: Pass KRB5CCNAME to PAM. From deengert
17 at anl.gov, ok djm@
16 18
1720040830 1920040830
18 - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only 20 - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
@@ -1732,4 +1734,4 @@
1732 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1734 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1733 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1735 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1734 1736
1735$Id: ChangeLog,v 1.3546 2004/09/11 13:26:37 dtucker Exp $ 1737$Id: ChangeLog,v 1.3547 2004/09/11 13:32:09 dtucker Exp $
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)
187 snprintf(authctxt->krb5_ccname, len, "FILE:%s", 187 snprintf(authctxt->krb5_ccname, len, "FILE:%s",
188 authctxt->krb5_ticket_file); 188 authctxt->krb5_ticket_file);
189 189
190#ifdef USE_PAM
191 if (options.use_pam)
192 do_pam_putenv("KRB5CCNAME", authctxt->krb5_ccname);
193#endif
194
190 out: 195 out:
191 restore_uid(); 196 restore_uid();
192 197