1 files changed, 7 insertions, 3 deletions

diff --git a/session.c b/session.c
index a5634ccc2..fca7e4095 100644
--- a/session.c
+++ b/session.c
@@ -1094,11 +1094,15 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
                 child_set_env(&env, &envsize, "TERM", s->term);
         if (s->display)
                 child_set_env(&env, &envsize, "DISPLAY", s->display);
-        if (wildcard_match) {
+        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. */
                 child_set_env(&env, &envsize, "SSH_REMOTE_KEY",
-                    wildcard_match);
+                        wildcard_remote_key);
+                child_set_env(&env, &envsize, "SSH_REMOTE_KEY_TYPE",
+                        wildcard_remote_key_type);
                 child_set_env(&env, &envsize, "SSH_REMOTE_FINGERPRINT",
-                    wildcard_fingerprint);
+                        wildcard_remote_key_fingerprint);
         }