summaryrefslogtreecommitdiffstats
path: root/crypto/openssh
diff options
context:
space:
mode:
authornectar <nectar@FreeBSD.org>2001-12-03 00:51:47 +0000
committernectar <nectar@FreeBSD.org>2001-12-03 00:51:47 +0000
commitb0b55f7f5f8c992b7805f3bb6f615c04c0301b8b (patch)
treee47cd70864f36b33a14678b1a822ddc910fdad38 /crypto/openssh
parent30f5e7ea6e8102cba1c7db2753e8a7c1dbf8137d (diff)
downloadFreeBSD-src-b0b55f7f5f8c992b7805f3bb6f615c04c0301b8b.zip
FreeBSD-src-b0b55f7f5f8c992b7805f3bb6f615c04c0301b8b.tar.gz
Do not pass user-defined environmental variables to /usr/bin/login.
Obtained from: OpenBSD Approved by: green
Diffstat (limited to 'crypto/openssh')
-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 2a725ea..f5e0811 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());
OpenPOWER on IntegriCloud