diff options
| author |   dtucker <dtucker@openbsd.org> | 2017-07-14 03:18:21 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2017-07-14 03:18:21 +0000 |
| commit | cbe5c9df4fa3032533c9f48b5d9f704f8ff07988 (patch) | |
| tree | c029cd11947f0e9dbcaac6f6424856d039d97247 | |
| parent | man pages with pseudo synopses which list filenames end up creating (diff) | |
| download | wireguard-openbsd-cbe5c9df4fa3032533c9f48b5d9f704f8ff07988.tar.xz wireguard-openbsd-cbe5c9df4fa3032533c9f48b5d9f704f8ff07988.zip | |
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@
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index a762773d3a5..d66cfbe19e7 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/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 @@ -1409,8 +1409,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 |