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.

1 files changed, 2 insertions, 2 deletions

diff --git a/session.c b/session.c
index 4ae9cab66..fa6a01996 100644
--- a/session.c
+++ b/session.c
@@ -1072,8 +1072,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",