merge OPENSSH_3_8P1_GSSAPI_20040305 to gpt-branch

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index 135e4ef3cf47c59c496f5255ac9f29fbde2c8436..9696e84393a049c3c007e51a8e01467351d36a71 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -51,6 +51,14 @@ module that contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2004/03/05
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_8P1_GSSAPI_20040304
+        - new base: OPENSSH_3_8P1_GSSAPI_20040305
+      Conflicts: 0
+
     2004/03/04
     ----------
       Action: Merge

diff --git a/openssh/sshd.c b/openssh/sshd.c
index 474f77792982860611a68847062620e0959d239a..c2ab903bd07ae9a8a95381e7b22112bde30dd17c 100644 (file)
--- a/openssh/sshd.c
+++ b/openssh/sshd.c
@@ -1121,8 +1121,10 @@ main(int ac, char **av)
        chdir("/");
 
 #ifndef HAVE_CYGWIN
+#ifndef GSI /* GSI gets configuration from environment! */
        /* Clear environment */
        environ[0] = NULL;
+#endif
 #endif
 
        /* ignore SIGPIPE */