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@

diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index a4d12f7..53f63bf 100644 (file)
--- 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++;
                }
        }