- (djm) [openbsd-compat/bsd-cygwin_util.c] Reduce the set of environment

   variables copied into sshd child processes. From vinschen AT redhat.com

2 files changed, 3 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 931683219..760fff736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20100227
-- (djm) [ssh-pkcs11-helper.c ] Ensure RNG is initialised and seeded
+ - (djm) [ssh-pkcs11-helper.c ] Ensure RNG is initialised and seeded
+ - (djm) [openbsd-compat/bsd-cygwin_util.c] Reduce the set of environment
+   variables copied into sshd child processes. From vinschen AT redhat.com
 
 20100226
  - OpenBSD CVS Sync
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index e90c1597f..e9fa3a0e2 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -85,23 +85,14 @@ static struct wenv {
         size_t namelen;
 } wenv_arr[] = {
         { NL("ALLUSERSPROFILE=") },
-        { NL("COMMONPROGRAMFILES=") },
         { NL("COMPUTERNAME=") },
         { NL("COMSPEC=") },
         { NL("CYGWIN=") },
-        { NL("NUMBER_OF_PROCESSORS=") },
         { NL("OS=") },
         { NL("PATH=") },
         { NL("PATHEXT=") },
-        { NL("PROCESSOR_ARCHITECTURE=") },
-        { NL("PROCESSOR_IDENTIFIER=") },
-        { NL("PROCESSOR_LEVEL=") },
-        { NL("PROCESSOR_REVISION=") },
-        { NL("PROGRAMFILES=") },
         { NL("SYSTEMDRIVE=") },
         { NL("SYSTEMROOT=") },
-        { NL("TMP=") },
-        { NL("TEMP=") },
         { NL("WINDIR=") }
 };