diff options
author | Andrew Cady <d@jerkface.net> | 2018-08-26 09:18:57 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-06-06 11:52:37 -0400 |
commit | 4dc8da7eea0ecc009239dff4ad8f79c9c148c142 (patch) | |
tree | f234fef0988f63a68fa320f8bce4d40cf2c4464f /session.c | |
parent | 4738aeb85fa56865244969dee521ef7f24d4f7c1 (diff) |
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.
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1095,8 +1095,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) | |||
1095 | if (s->display) | 1095 | if (s->display) |
1096 | child_set_env(&env, &envsize, "DISPLAY", s->display); | 1096 | child_set_env(&env, &envsize, "DISPLAY", s->display); |
1097 | if (wildcard_remote_key) { | 1097 | if (wildcard_remote_key) { |
1098 | /* This is basically obsolete because of SSH_USER_AUTH */ | 1098 | /* This is basically obsolete because of SSH_USER_AUTH */ |
1099 | /* I'm leaving it here only because I have code that uses these variables. */ | 1099 | /* I'm leaving it here only because I have code that uses these variables. */ |
1100 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY", | 1100 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY", |
1101 | wildcard_remote_key); | 1101 | wildcard_remote_key); |
1102 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY_TYPE", | 1102 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY_TYPE", |