]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: don't exit the listener on send_rexec_state errors; ok
authormarkus@openbsd.org <markus@openbsd.org>
Fri, 3 Jul 2020 10:10:17 +0000 (10:10 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 15 Jul 2020 05:06:44 +0000 (15:06 +1000)
djm

OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c

sshd.c

diff --git a/sshd.c b/sshd.c
index 44cc3ac9231385cd9a6931a1dac854bba5ba2ed6..85229ac8042cbe4919eb9dcb94054023271d0c11 100644 (file)
--- 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);