aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2001-12-03 00:54:54 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2001-12-03 00:54:54 +0000
commit8a2d9867da759ed856e70aff6e58513cfe9e5e05 (patch)
tree0083f6285281bf5bf7aa13d4da240dd1cc152b5a /crypto
parent0a52c307d89235f9745c7ae9c29df11bf4c33e9a (diff)
downloadsrc-8a2d9867da759ed856e70aff6e58513cfe9e5e05.tar.gz
src-8a2d9867da759ed856e70aff6e58513cfe9e5e05.zip
MFC 1.18: Do not pass user-defined environmental variables to /usr/bin/login.
Notes
Notes: svn path=/stable/4/; revision=87256
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssh/session.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 2a725ea22cf9..f5e0811f55a2 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -1154,6 +1154,7 @@ do_child(Session *s, const char *command)
child_set_env(&env, &envsize, "TZ", getenv("TZ"));
/* Set custom environment options from RSA authentication. */
+ if (!options.use_login) {
while (custom_environment) {
struct envstring *ce = custom_environment;
char *s = ce->s;
@@ -1167,6 +1168,7 @@ do_child(Session *s, const char *command)
xfree(ce->s);
xfree(ce);
}
+ }
snprintf(buf, sizeof buf, "%.50s %d %d",
get_remote_ipaddr(), get_remote_port(), get_local_port());