diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-09-22 02:29:57 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-09-24 05:38:04 +1000 |
| commit | f31c654b30a6f02ce0b8ea8ab81791b675489628 (patch) | |
| tree | 110ffeed4707055a4142dbbb80e0589d123bffdf /sshconnect2.c | |
| parent | 1622649b7a829fc8dc313042a43a974f0f3e8a99 (diff) | |
| download | openssh-git-f31c654b30a6f02ce0b8ea8ab81791b675489628.tar.gz | |
upstream commit
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@
Upstream-ID: b3afe126c0839d2eae6cddd41ff2ba317eda0903
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index fae8b0f2..5e7d07dc 100644 --- a/sshconnect2.c +++ b/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. @@ -404,6 +404,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); } |