- (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.

2 files changed, 7 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index fb993479..1f2bc412 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.
+
 20040304
  - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with
    -DUSE_POSIX_THREADS.  From antoine.verheijen at ualbert ca.  ok djm@
@@ -1941,4 +1945,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3257.2.4 2004/03/04 11:56:57 dtucker Exp $
+$Id: ChangeLog,v 1.3257.2.5 2004/03/08 11:20:16 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 6169a733..e6f407f8 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.287 2004/02/25 00:22:45 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.286 2004/02/23 12:02:33 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -101,7 +101,6 @@ extern char *__progname;
 #else
 char *__progname;
 #endif
-extern char **environ;
 
 /* Server configuration options. */
 ServerOptions options;
@@ -568,7 +567,7 @@ privsep_preauth_child(void)
 	debug3("privsep user:group %u:%u", (u_int)pw->pw_uid,
 	    (u_int)pw->pw_gid);
 #if 0
-	/* XXX not ready, too heavy after chroot */
+	/* XXX not ready, to heavy after chroot */
 	do_setusercontext(pw);
 #else
 	gidset[0] = pw->pw_gid;
@@ -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);