summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-09-11 23:32:09 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-09-11 23:32:09 +1000
commit5614d8f8c48faf1526e472ef760b1cb116ae069d (patch)
tree70d707b5fefcc3902b9ff32438d89841e09668e8
parenta0c2b394b4e6d881bb70ab25c77d25922e07fd40 (diff)
- (dtucker) [auth-krb5.c] Bug #922: Pass KRB5CCNAME to PAM. From deengert
at anl.gov, ok djm@
-rw-r--r--ChangeLog4
-rw-r--r--auth-krb5.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 750751fb..995e1bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
- (dtucker) [session.c] Bug #927: make .hushlogin silent again. ok djm@
- (dtucker) [configure.ac] Bug #321: Add cross-compile support to configure.
Parts by chua at ayrnetworks.com, astrand at lysator.liu.se and me. ok djm@
+ - (dtucker) [auth-krb5.c] Bug #922: Pass KRB5CCNAME to PAM. From deengert
+ at anl.gov, ok djm@
20040830
- (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
@@ -1732,4 +1734,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3546 2004/09/11 13:26:37 dtucker Exp $
+$Id: ChangeLog,v 1.3547 2004/09/11 13:32:09 dtucker Exp $
diff --git a/auth-krb5.c b/auth-krb5.c
index a324ff15..2f742534 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();