- (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@

diff --git a/ChangeLog b/ChangeLog
index 06e9fe927760c1b048a69e6ab404774ead04fcbb..4520f298586ceb6b7a7cd0e28f338424c2d687d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
  - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv,
    and use it for do_pam_session.  Fixes problems like pam_motd not displaying
    anything.  ok djm@
+ - (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@
 
 20031117
  - (djm) OpenBSD CVS Sync

diff --git a/auth-pam.c b/auth-pam.c
index 056e9aae39b0854e815179ceba2066da50851f89..1f310de5d7e2957ed15a25153d7d62ff3929ef56 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -167,11 +167,13 @@ import_environments(Buffer *b)
        for(i = 0; i < num_env; i++) {
                env = buffer_get_string(b, NULL);
 
+#ifdef HAVE_PAM_PUTENV
                /* Errors are not fatal here */
                if ((err = pam_putenv(sshpam_handle, env)) != PAM_SUCCESS) {
                        error("PAM: pam_putenv: %s",
                            pam_strerror(sshpam_handle, sshpam_err));
                }
+#endif
        }
 }