diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth-pam.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -4,6 +4,7 @@ | |||
4 | - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv, | 4 | - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv, |
5 | and use it for do_pam_session. Fixes problems like pam_motd not displaying | 5 | and use it for do_pam_session. Fixes problems like pam_motd not displaying |
6 | anything. ok djm@ | 6 | anything. ok djm@ |
7 | - (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@ | ||
7 | 8 | ||
8 | 20031117 | 9 | 20031117 |
9 | - (djm) OpenBSD CVS Sync | 10 | - (djm) OpenBSD CVS Sync |
@@ -1479,4 +1480,4 @@ | |||
1479 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1480 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1480 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1481 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1481 | 1482 | ||
1482 | $Id: ChangeLog,v 1.3114 2003/11/18 01:42:07 dtucker Exp $ | 1483 | $Id: ChangeLog,v 1.3115 2003/11/18 01:45:35 dtucker Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index af8d37fab..2594bed3d 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
33 | #include "includes.h" | 33 | #include "includes.h" |
34 | RCSID("$Id: auth-pam.c,v 1.81 2003/11/18 01:42:08 dtucker Exp $"); | 34 | RCSID("$Id: auth-pam.c,v 1.82 2003/11/18 01:45:36 dtucker Exp $"); |
35 | 35 | ||
36 | #ifdef USE_PAM | 36 | #ifdef USE_PAM |
37 | #include <security/pam_appl.h> | 37 | #include <security/pam_appl.h> |
@@ -167,11 +167,13 @@ import_environments(Buffer *b) | |||
167 | for(i = 0; i < num_env; i++) { | 167 | for(i = 0; i < num_env; i++) { |
168 | env = buffer_get_string(b, NULL); | 168 | env = buffer_get_string(b, NULL); |
169 | 169 | ||
170 | #ifdef HAVE_PAM_PUTENV | ||
170 | /* Errors are not fatal here */ | 171 | /* Errors are not fatal here */ |
171 | if ((err = pam_putenv(sshpam_handle, env)) != PAM_SUCCESS) { | 172 | if ((err = pam_putenv(sshpam_handle, env)) != PAM_SUCCESS) { |
172 | error("PAM: pam_putenv: %s", | 173 | error("PAM: pam_putenv: %s", |
173 | pam_strerror(sshpam_handle, sshpam_err)); | 174 | pam_strerror(sshpam_handle, sshpam_err)); |
174 | } | 175 | } |
176 | #endif | ||
175 | } | 177 | } |
176 | } | 178 | } |
177 | 179 | ||