2 files changed, 5 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 04c446f42..24afd751e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040308
+ - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some
+   platforms (eg SCO, HP-UX) with logging in the wrong TZ.
+
 20040307
  - (tim) [regress/login-timeout.sh] fix building outside of source tree.
 
@@ -857,4 +861,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.3277 2004/03/07 18:40:01 tim Exp $
+$Id: ChangeLog,v 1.3278 2004/03/08 11:13:12 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 6169a7336..2c224b9c3 100644
--- a/sshd.c
+++ b/sshd.c
@@ -101,7 +101,6 @@ extern char *__progname;
 #else
 char *__progname;
 #endif
-extern char **environ;
 
 /* Server configuration options. */
 ServerOptions options;
@@ -1106,11 +1105,6 @@ main(int ac, char **av)
            unmounted if desired. */
         chdir("/");
 
-#ifndef HAVE_CYGWIN
-        /* Clear environment */
-        environ[0] = NULL;
-#endif
-
         /* ignore SIGPIPE */
         signal(SIGPIPE, SIG_IGN);