diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-06-22 23:42:16 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-06-23 10:34:47 +1000 |
commit | 9488538a726951e82b3a4374f3c558d72c80a89b (patch) | |
tree | cbbd7997b2be5c5a82eae6b625b1c77ada5eddbe /monitor.c | |
parent | 63b78d003bd8ca111a736e6cea6333da50f5f09b (diff) |
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
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.149 2015/05/04 06:10:48 djm Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.150 2015/06/22 23:42:16 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -404,7 +404,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) | |||
404 | if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) { | 404 | if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) { |
405 | auth_log(authctxt, authenticated, partial, | 405 | auth_log(authctxt, authenticated, partial, |
406 | auth_method, auth_submethod); | 406 | auth_method, auth_submethod); |
407 | if (!authenticated) | 407 | if (!partial && !authenticated) |
408 | authctxt->failures++; | 408 | authctxt->failures++; |
409 | } | 409 | } |
410 | } | 410 | } |