upstream commit

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@

Upstream-ID: eb74b8e506714d0f649bd5c300f762a527af04a3

diff --git a/monitor.c b/monitor.c
index f520c978fe1ad1c46fb74a25ac7f7a3bd506f150..b4109657efdf546b119f9a82693e66f4e557e7d5 100644 (file)
--- a/monitor.c
+++ b/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>
@@ -404,7 +404,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++;
                }
        }