From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 3 Jul 2020 10:10:17 +0000 (+0000)
Subject: upstream: don't exit the listener on send_rexec_state errors; ok
X-Git-Tag: V_8_4_P1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af4a743693ccbea3e15fc9e93edbeb610fa94f4;p=thirdparty%2Fopenssh-portable.git

upstream: don't exit the listener on send_rexec_state errors; ok

djm

OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c
---

diff --git a/sshd.c b/sshd.c
index 44cc3ac92..85229ac80 100644
--- a/sshd.c
+++ b/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
@@ -965,7 +965,7 @@ send_rexec_state(int fd, struct sshbuf *conf)
 	rexec_send_rng_seed(m);
 #endif
 	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);