upstream commit

Make ""Killed by signal 1" LogLevel verbose so it's not
shown at the default level.  Prevents it from appearing during ssh -J and
equivalent ProxyCommand configs. bz#1906, bz#2744, feedback&ok markus@

Upstream-ID: debfaa7e859b272246c2f2633335d288d2e2ae28

diff --git a/clientloop.c b/clientloop.c
index b6443ced8f3fc2a8ecb12c8c40a3fce6d498b3b1..248c9541fe25c984f18a1fec45109ed7f33a5095 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.300 2017/06/23 07:24:48 mestre Exp $ */
+/* $OpenBSD: clientloop.c,v 1.301 2017/07/14 03:18:21 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1418,8 +1418,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                exit_status = 0;
        }
 
-       if (received_signal)
-               fatal("Killed by signal %d.", (int) received_signal);
+       if (received_signal) {
+               verbose("Killed by signal %d.", (int) received_signal);
+               cleanup_exit(0);
+       }
 
        /*
         * In interactive mode (with pseudo tty) display a message indicating