Log IP addresses of hosts attempting to use blacklisted keys (closes:

#481721).

1 files changed, 6 insertions, 4 deletions

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 4976a5a8a..0870d64f6 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -277,11 +277,13 @@ user_key_allowed(struct passwd *pw, Key *key)
         if (blacklisted_key(key) == 1) {
                 fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
                 if (options.permit_blacklisted_keys)
-                        logit("Public key %s blacklisted (see "
-                            "ssh-vulnkey(1)); continuing anyway", fp);
+                        logit("Public key %s from %s blacklisted (see "
+                            "ssh-vulnkey(1)); continuing anyway",
+                            fp, get_remote_ipaddr());
                 else
-                        logit("Public key %s blacklisted (see "
-                            "ssh-vulnkey(1))", fp);
+                        logit("Public key %s from %s blacklisted (see "
+                            "ssh-vulnkey(1))",
+                            fp, get_remote_ipaddr());
                 xfree(fp);
                 if (!options.permit_blacklisted_keys)
                         return 0;