diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
| commit | 983ad11a1c78949e86a0f51f51ef0d614cc5e665 (patch) | |
| tree | 7d41ca8690f59b7463bd4d5fefde78dac8a00e60 /crypto/openssh/auth-krb5.c | |
| parent | 3c5bc6b274083ffa3a7aa67e87c8936a1778eff5 (diff) | |
| download | FreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.zip FreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/auth-krb5.c')
| -rw-r--r-- | crypto/openssh/auth-krb5.c | 5 |
1 files changed, 5 insertions, 0 deletions
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(); |
