From e3ed5eaedd8fa5f458bc0e8bc8fe6c3e2de235e7 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 2 Jul 2008 13:30:35 +0000 Subject: really really remove the freebie "none" auth try for protocol 2 --- usr.bin/ssh/auth2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c index d3bbd22b73f..b1385d9a6d5 100644 --- a/usr.bin/ssh/auth2.c +++ b/usr.bin/ssh/auth2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.117 2008/07/02 12:36:39 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.118 2008/07/02 13:30:34 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -288,7 +288,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) /* now we can break out */ authctxt->success = 1; } else { - if (++authctxt->failures > options.max_authtries) + if (++authctxt->failures >= options.max_authtries) packet_disconnect(AUTH_FAIL_MSG, authctxt->user); methods = authmethods_get(); packet_start(SSH2_MSG_USERAUTH_FAILURE); -- cgit v1.2.3