From 058f839fe15c51be8b3a844a76ab9a8db550be4f Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Thu, 18 Dec 2014 23:58:04 +0000 Subject: upstream commit don't count partial authentication success as a failure against MaxAuthTries; ok deraadt@ --- auth2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'auth2.c') diff --git a/auth2.c b/auth2.c index d9b440ae..3a803e69 100644 --- a/auth2.c +++ b/auth2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.132 2014/07/15 15:54:14 millert Exp $ */ +/* $OpenBSD: auth2.c,v 1.133 2014/12/18 23:58:04 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -356,7 +356,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, const char *method, } else { /* Allow initial try of "none" auth without failure penalty */ - if (!authctxt->server_caused_failure && + if (!partial && !authctxt->server_caused_failure && (authctxt->attempt > 1 || strcmp(method, "none") != 0)) authctxt->failures++; if (authctxt->failures >= options.max_authtries) { -- cgit v1.2.3