diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshconnect2.c | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -2,6 +2,10 @@ | |||
2 | - (djm) [auth.c configure.ac misc.c monitor.c monitor_wrap.c] Support | 2 | - (djm) [auth.c configure.ac misc.c monitor.c monitor_wrap.c] Support |
3 | platforms, such as Android, that lack struct passwd.pw_gecos. Report | 3 | platforms, such as Android, that lack struct passwd.pw_gecos. Report |
4 | and initial patch from Nathan Osman bz#2086; feedback tim@ ok dtucker@ | 4 | and initial patch from Nathan Osman bz#2086; feedback tim@ ok dtucker@ |
5 | - (djm) OpenBSD CVS Sync | ||
6 | - markus@cvs.openbsd.org 2013/03/05 20:16:09 | ||
7 | [sshconnect2.c] | ||
8 | reset pubkey order on partial success; ok djm@ | ||
5 | 9 | ||
6 | 20130418 | 10 | 20130418 |
7 | - (djm) [config.guess config.sub] Update to last versions before they switch | 11 | - (djm) [config.guess config.sub] Update to last versions before they switch |
diff --git a/sshconnect2.c b/sshconnect2.c index 58015c0d3..1a6a5850d 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.193 2013/03/05 20:16:09 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -540,8 +540,12 @@ input_userauth_failure(int type, u_int32_t seq, void *ctxt) | |||
540 | partial = packet_get_char(); | 540 | partial = packet_get_char(); |
541 | packet_check_eom(); | 541 | packet_check_eom(); |
542 | 542 | ||
543 | if (partial != 0) | 543 | if (partial != 0) { |
544 | logit("Authenticated with partial success."); | 544 | logit("Authenticated with partial success."); |
545 | /* reset state */ | ||
546 | pubkey_cleanup(authctxt); | ||
547 | pubkey_prepare(authctxt); | ||
548 | } | ||
545 | debug("Authentications that can continue: %s", authlist); | 549 | debug("Authentications that can continue: %s", authlist); |
546 | 550 | ||
547 | userauth(authctxt, authlist); | 551 | userauth(authctxt, authlist); |