summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2020-01-30 07:21:38 +0000
committerdjm <djm@openbsd.org>2020-01-30 07:21:38 +0000
commit60e46bd5fd624478e35788ab98249c6b2a93a14b (patch)
treedad3b935547b0c0835341ba2d32d6854eac1b34f /usr.bin/ssh/serverloop.c
parentcheck the return value of ssh_packet_write_poll() and call (diff)
downloadwireguard-openbsd-60e46bd5fd624478e35788ab98249c6b2a93a14b.tar.xz
wireguard-openbsd-60e46bd5fd624478e35788ab98249c6b2a93a14b.zip
use sshpkt_fatal() instead of plain fatal() for ssh_packet_write_poll()
failures here too as the former yields better error messages; ok dtucker@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r--usr.bin/ssh/serverloop.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 950891a6c64..71f3169e90c 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.221 2020/01/25 22:41:01 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.222 2020/01/30 07:21:38 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -354,9 +354,10 @@ process_output(struct ssh *ssh, fd_set *writeset, int connection_out)
/* Send any buffered packet data to the client. */
if (FD_ISSET(connection_out, writeset)) {
- if ((r = ssh_packet_write_poll(ssh)) != 0)
- fatal("%s: ssh_packet_write_poll: %s",
- __func__, ssh_err(r));
+ if ((r = ssh_packet_write_poll(ssh)) != 0) {
+ sshpkt_fatal(ssh, r, "%s: ssh_packet_write_poll",
+ __func__);
+ }
}
}