diff options
author | Damien Miller <djm@mindrot.org> | 2013-04-23 15:15:49 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-04-23 15:15:49 +1000 |
commit | 62e9c4f9b6027620f9091a2f43328e057bdb33f1 (patch) | |
tree | 89953ffc1c609d3f637b0729283a7675325f4bd2 /sshconnect2.c | |
parent | 6332da2ae88db623d7da8070dd807efa26d9dfe8 (diff) |
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2013/03/05 20:16:09
[sshconnect2.c]
reset pubkey order on partial success; ok djm@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 6 insertions, 2 deletions
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); |