summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2015-06-22 23:42:17 +0000
committerDamien Miller <djm@cvs.openbsd.org>2015-06-22 23:42:17 +0000
commitfce58d1935b0c3ba3ad7a3be228e659e6f8698e5 (patch)
treea6576bf8aed9c20ae60939839945dedc9b275437 /usr.bin
parent4378f09f5e30e362ccec62784b09f8dcb1412046 (diff)
Don't count successful partial authentication as failures in monitor;
this may have caused the monitor to refuse multiple authentications that would otherwise have successfully completed; ok markus@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index a4d12f7fe7e..53f63bf0fde 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.149 2015/05/04 06:10:48 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.150 2015/06/22 23:42:16 djm Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -311,7 +311,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) {
auth_log(authctxt, authenticated, partial,
auth_method, auth_submethod);
- if (!authenticated)
+ if (!partial && !authenticated)
authctxt->failures++;
}
}