summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-28 03:29:33 +1100
committerDamien Miller <djm@mindrot.org>2010-02-28 03:29:33 +1100
commitd05951fceee3fe19fc0bea29006a6409419b609f (patch)
treeb81f6c100b40571ec4236dc569ebd3652893c1b2
parent09a24db2d7e89c2fe72c1754181b6cc6e62949d7 (diff)
- (djm) [openbsd-compat/bsd-cygwin_util.c] Reduce the set of environment
variables copied into sshd child processes. From vinschen AT redhat.com
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/bsd-cygwin_util.c9
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 @@
120100227 120100227
2- (djm) [ssh-pkcs11-helper.c ] Ensure RNG is initialised and seeded 2 - (djm) [ssh-pkcs11-helper.c ] Ensure RNG is initialised and seeded
3 - (djm) [openbsd-compat/bsd-cygwin_util.c] Reduce the set of environment
4 variables copied into sshd child processes. From vinschen AT redhat.com
3 5
420100226 620100226
5 - OpenBSD CVS Sync 7 - 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 {
85 size_t namelen; 85 size_t namelen;
86} wenv_arr[] = { 86} wenv_arr[] = {
87 { NL("ALLUSERSPROFILE=") }, 87 { NL("ALLUSERSPROFILE=") },
88 { NL("COMMONPROGRAMFILES=") },
89 { NL("COMPUTERNAME=") }, 88 { NL("COMPUTERNAME=") },
90 { NL("COMSPEC=") }, 89 { NL("COMSPEC=") },
91 { NL("CYGWIN=") }, 90 { NL("CYGWIN=") },
92 { NL("NUMBER_OF_PROCESSORS=") },
93 { NL("OS=") }, 91 { NL("OS=") },
94 { NL("PATH=") }, 92 { NL("PATH=") },
95 { NL("PATHEXT=") }, 93 { NL("PATHEXT=") },
96 { NL("PROCESSOR_ARCHITECTURE=") },
97 { NL("PROCESSOR_IDENTIFIER=") },
98 { NL("PROCESSOR_LEVEL=") },
99 { NL("PROCESSOR_REVISION=") },
100 { NL("PROGRAMFILES=") },
101 { NL("SYSTEMDRIVE=") }, 94 { NL("SYSTEMDRIVE=") },
102 { NL("SYSTEMROOT=") }, 95 { NL("SYSTEMROOT=") },
103 { NL("TMP=") },
104 { NL("TEMP=") },
105 { NL("WINDIR=") } 96 { NL("WINDIR=") }
106}; 97};
107 98