diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-09-22 02:29:58 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-09-22 02:29:58 +0000 |
| commit | 80e5134bff09b4da99967acc344f042921a82f59 (patch) | |
| tree | 9ae486f1c326268a4f5fb6dc3aa5e0e83634c1b4 /usr.bin | |
| parent | 4c068d6c51cbc9b820008b37570fa23df72a8a48 (diff) | |
If ssh receives a PACKET_DISCONNECT during userauth it will cause
ssh_dispatch_run(DISPATCH_BLOCK, ...) to return without the session
being authenticated. Check for this and exit if necessary. ok djm@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 513c07f0494..e7d39840e7c 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.247 2016/07/22 05:46:11 dtucker Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.248 2016/09/22 02:29:57 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -396,6 +396,8 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host, pubkey_cleanup(&authctxt); ssh_dispatch_range(ssh, SSH2_MSG_USERAUTH_MIN, SSH2_MSG_USERAUTH_MAX, NULL); + if (!authctxt.success) + fatal("Authentication failed."); debug("Authentication succeeded (%s).", authctxt.method->name); } |