summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/auth2.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2014-07-03 11:16:56 +0000
committerDamien Miller <djm@cvs.openbsd.org>2014-07-03 11:16:56 +0000
commitf96313b2e43d4c6392e2324b175e92e7eb3686f1 (patch)
tree0a19972189a865fdb67b40597d5353a2b74dc7a1 /usr.bin/ssh/auth2.c
parent9bbaf06cd021b8f130186aba2ab423de1b6ef145 (diff)
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
Diffstat (limited to 'usr.bin/ssh/auth2.c')
-rw-r--r--usr.bin/ssh/auth2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c
index 72321dc408d..4767e6e6c0d 100644
--- a/usr.bin/ssh/auth2.c
+++ b/usr.bin/ssh/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.130 2014/01/29 06:18:35 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.131 2014/07/03 11:16:55 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -312,7 +312,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, const char *method,
(authctxt->attempt > 1 || strcmp(method, "none") != 0))
authctxt->failures++;
if (authctxt->failures >= options.max_authtries)
- packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
+ auth_maxtries_exceeded(authctxt);
methods = authmethods_get(authctxt);
debug3("%s: failure partial=%d next methods=\"%s\"", __func__,
partial, methods);