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

#481721).

1 files changed, 7 insertions, 4 deletions

diff --git a/auth-rsa.c b/auth-rsa.c
index 87e1fbf59..898e9eb50 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -42,6 +42,7 @@
 #include "hostfile.h"
 #include "authfile.h"
 #include "auth.h"
+#include "canohost.h"
 #ifdef GSSAPI
 #include "ssh-gss.h"
 #endif
@@ -270,11 +271,13 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
                 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)
                                 continue;