diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2018-07-11 18:55:11 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-12 13:18:25 +1000 |
| commit | 394a842e60674bf8ee5130b9f15b01452a0b0285 (patch) | |
| tree | efc4184c84cdc47de1d8b9c77ab22359e8160a97 /auth2-chall.c | |
| parent | 5467fbcb09528ecdcb914f4f2452216c24796790 (diff) | |
upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@
OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3
Diffstat (limited to 'auth2-chall.c')
| -rw-r--r-- | auth2-chall.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-chall.c b/auth2-chall.c index 5edd0e65..4fd18f46 100644 --- a/auth2-chall.c +++ b/auth2-chall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-chall.c,v 1.49 2018/07/09 21:35:50 markus Exp $ */ +/* $OpenBSD: auth2-chall.c,v 1.50 2018/07/11 18:55:11 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved. @@ -280,9 +280,9 @@ send_userauth_info_request(struct ssh *ssh) (r = sshpkt_put_u8(ssh, echo_on[i])) != 0) fatal("%s: %s", __func__, ssh_err(r)); } - if ((r = sshpkt_send(ssh)) != 0) + if ((r = sshpkt_send(ssh)) != 0 || + (r = ssh_packet_write_wait(ssh)) != 0) fatal("%s: %s", __func__, ssh_err(r)); - ssh_packet_write_wait(ssh); for (i = 0; i < kbdintctxt->nreq; i++) free(prompts[i]); |