diff options
author | Andrew Cady <d@jerkface.net> | 2018-08-26 09:18:57 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2020-08-16 14:44:23 -0400 |
commit | 075d1a82801ad898eeb02446d0b5399c622a329d (patch) | |
tree | 06af2f513642444737b28e297c3eb024c1efd0e5 /session.c | |
parent | 0c69b8b9c83b9f6e6ff5114514a25e70a52b14ce (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
@@ -1072,8 +1072,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) | |||
1072 | if (s->display) | 1072 | if (s->display) |
1073 | child_set_env(&env, &envsize, "DISPLAY", s->display); | 1073 | child_set_env(&env, &envsize, "DISPLAY", s->display); |
1074 | if (wildcard_remote_key) { | 1074 | if (wildcard_remote_key) { |
1075 | /* This is basically obsolete because of SSH_USER_AUTH */ | 1075 | /* This is basically obsolete because of SSH_USER_AUTH */ |
1076 | /* I'm leaving it here only because I have code that uses these variables. */ | 1076 | /* I'm leaving it here only because I have code that uses these variables. */ |
1077 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY", | 1077 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY", |
1078 | wildcard_remote_key); | 1078 | wildcard_remote_key); |
1079 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY_TYPE", | 1079 | child_set_env(&env, &envsize, "SSH_REMOTE_KEY_TYPE", |