From 4dc8da7eea0ecc009239dff4ad8f79c9c148c142 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sun, 26 Aug 2018 09:18:57 -0400 Subject: Restore wildcard semantics We now ignore the wildcard if we have another matching key -- even if the wildcard entry comes first in authorized_keys. This is how it worked before the forward port. --- session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'session.c') diff --git a/session.c b/session.c index fca7e4095..694c41a4c 100644 --- a/session.c +++ b/session.c @@ -1095,8 +1095,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) if (s->display) child_set_env(&env, &envsize, "DISPLAY", s->display); if (wildcard_remote_key) { - /* This is basically obsolete because of SSH_USER_AUTH */ - /* I'm leaving it here only because I have code that uses these variables. */ + /* This is basically obsolete because of SSH_USER_AUTH */ + /* I'm leaving it here only because I have code that uses these variables. */ child_set_env(&env, &envsize, "SSH_REMOTE_KEY", wildcard_remote_key); child_set_env(&env, &envsize, "SSH_REMOTE_KEY_TYPE", -- cgit v1.2.3