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-pubkey.c | |
parent | 5467fbcb09528ecdcb914f4f2452216c24796790 (diff) |
upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@
OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index e649a6253..c4d0f7908 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.81 2018/07/09 21:35:50 markus Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.82 2018/07/11 18:55:11 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -218,9 +218,9 @@ userauth_pubkey(struct ssh *ssh) | |||
218 | != 0 || | 218 | != 0 || |
219 | (r = sshpkt_put_cstring(ssh, pkalg)) != 0 || | 219 | (r = sshpkt_put_cstring(ssh, pkalg)) != 0 || |
220 | (r = sshpkt_put_string(ssh, pkblob, blen)) != 0 || | 220 | (r = sshpkt_put_string(ssh, pkblob, blen)) != 0 || |
221 | (r = sshpkt_send(ssh)) != 0) | 221 | (r = sshpkt_send(ssh)) != 0 || |
222 | (r = ssh_packet_write_wait(ssh)) != 0) | ||
222 | fatal("%s: %s", __func__, ssh_err(r)); | 223 | fatal("%s: %s", __func__, ssh_err(r)); |
223 | ssh_packet_write_wait(ssh); | ||
224 | authctxt->postponed = 1; | 224 | authctxt->postponed = 1; |
225 | } | 225 | } |
226 | } | 226 | } |