1 files changed, 26 insertions, 9 deletions

diff --git a/auth-options.c b/auth-options.c
index facfc025b..9ab1880d9 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -58,9 +58,20 @@ int forced_tun_device = -1;
 /* "principals=" option. */
 char *authorized_principals = NULL;
 
+/* Throttle log messages. */
+int logged_from_hostip = 0;
+int logged_cert_hostip = 0;
+
 extern ServerOptions options;
 
 void
+auth_start_parse_options(void)
+{
+        logged_from_hostip = 0;
+        logged_cert_hostip = 0;
+}
+
+void
 auth_clear_options(void)
 {
         no_agent_forwarding_flag = 0;
@@ -293,10 +304,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 /* FALLTHROUGH */
                         case 0:
                                 free(patterns);
-                                logit("Authentication tried for %.100s with "
-                                    "correct key but not from a permitted "
-                                    "host (host=%.200s, ip=%.200s).",
-                                    pw->pw_name, remote_host, remote_ip);
+                                if (!logged_from_hostip) {
+                                        logit("Authentication tried for %.100s with "
+                                            "correct key but not from a permitted "
+                                            "host (host=%.200s, ip=%.200s).",
+                                            pw->pw_name, remote_host, remote_ip);
+                                        logged_from_hostip = 1;
+                                }
                                 auth_debug_add("Your host '%.200s' is not "
                                     "permitted to use this key for login.",
                                     remote_host);
@@ -519,11 +533,14 @@ parse_option_list(struct sshbuf *oblob, struct passwd *pw,
                                         break;
                                 case 0:
                                         /* no match */
-                                        logit("Authentication tried for %.100s "
-                                            "with valid certificate but not "
-                                            "from a permitted host "
-                                            "(ip=%.200s).", pw->pw_name,
-                                            remote_ip);
+                                        if (!logged_cert_hostip) {
+                                                logit("Authentication tried for %.100s "
+                                                    "with valid certificate but not "
+                                                    "from a permitted host "
+                                                    "(ip=%.200s).", pw->pw_name,
+                                                    remote_ip);
+                                                logged_cert_hostip = 1;
+                                        }
                                         auth_debug_add("Your address '%.200s' "
                                             "is not permitted to use this "
                                             "certificate for login.",