summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth-pam.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 310375711..48de6b1c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 problem reported by Tavis Ormandy, Google Security Team; 6 problem reported by Tavis Ormandy, Google Security Team;
7 ok markus@ deraadt@ 7 ok markus@ deraadt@
8 - (djm) Add openssh.xml to .cvsignore and sort it 8 - (djm) Add openssh.xml to .cvsignore and sort it
9 - (dtucker) [auth-pam.c] Propogate TZ environment variable to PAM auth
10 process so that any logging it does is with the right timezone. From
11 Scott Strickler, ok djm@.
9 12
1020060912 1320060912
11 - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in] 14 - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in]
@@ -5442,4 +5445,4 @@
5442 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5445 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5443 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5446 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5444 5447
5445$Id: ChangeLog,v 1.4546 2006/09/16 22:05:03 djm Exp $ 5448$Id: ChangeLog,v 1.4547 2006/09/17 01:57:46 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 493993a10..c08d47229 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -437,10 +437,16 @@ sshpam_thread(void *ctxtp)
437 u_int i; 437 u_int i;
438 const char *pam_user; 438 const char *pam_user;
439 const char **ptr_pam_user = &pam_user; 439 const char **ptr_pam_user = &pam_user;
440 char *tz = getenv("TZ");
440 441
441 pam_get_item(sshpam_handle, PAM_USER, 442 pam_get_item(sshpam_handle, PAM_USER,
442 (sshpam_const void **)ptr_pam_user); 443 (sshpam_const void **)ptr_pam_user);
444
443 environ[0] = NULL; 445 environ[0] = NULL;
446 if (tz != NULL)
447 if (setenv("TZ", tz, 1) == -1)
448 error("PAM: could not set TZ environment: %s",
449 strerror(errno));
444 450
445 if (sshpam_authctxt != NULL) { 451 if (sshpam_authctxt != NULL) {
446 setproctitle("%s [pam]", 452 setproctitle("%s [pam]",