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 93168321..760fff73 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 e90c1597..e9fa3a0e 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=") }
};