- djm@cvs.openbsd.org 2014/07/03 11:16:55

     [auth.c auth.h auth1.c auth2.c]
     make the "Too many authentication failures" message include the
     user, source address, port and protocol in a format similar to the
     authentication success / failure messages; bz#2199, ok dtucker

1 files changed, 15 insertions, 1 deletions

diff --git a/auth.c b/auth.c
index fcb314cbd..890dde046 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.104 2014/04/29 18:01:49 markus Exp $ */
+/* $OpenBSD: auth.c,v 1.105 2014/07/03 11:16:55 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -326,6 +326,20 @@ auth_log(Authctxt *authctxt, int authenticated, int partial,
 #endif
 }
 
+
+void
+auth_maxtries_exceeded(Authctxt *authctxt)
+{
+        packet_disconnect("Too many authentication failures for "
+            "%s%.100s from %.200s port %d %s",
+            authctxt->valid ? "" : "invalid user ",
+            authctxt->user,
+            get_remote_ipaddr(),
+            get_remote_port(),
+            compat20 ? "ssh2" : "ssh1");
+        /* NOTREACHED */
+}
+
 /*
  * Check whether root logins are disallowed.
  */