summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2020-07-03 10:10:17 +0000
committermarkus <markus@openbsd.org>2020-07-03 10:10:17 +0000
commit1f30ac4a9093be90356aa53b87874446f60e2a7a (patch)
tree189a7e684cebb5e9a73f373f5717c66511c1224e /usr.bin/ssh
parentput back the mux_ctx memleak fix, but only for channels of type (diff)
downloadwireguard-openbsd-1f30ac4a9093be90356aa53b87874446f60e2a7a.tar.xz
wireguard-openbsd-1f30ac4a9093be90356aa53b87874446f60e2a7a.zip
don't exit the listener on send_rexec_state errors; ok djm
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 40487cafca4..38c573017b6 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.557 2020/06/18 23:34:19 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.558 2020/07/03 10:10:17 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -920,7 +920,7 @@ send_rexec_state(int fd, struct sshbuf *conf)
(r = sshbuf_put_stringb(m, inc)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));
if (ssh_msg_send(fd, 0, m) == -1)
- fatal("%s: ssh_msg_send failed", __func__);
+ error("%s: ssh_msg_send failed", __func__);
sshbuf_free(m);
sshbuf_free(inc);