summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2015-12-03 17:05:05 +0000
commit65817bc1072df855200fafb439b443cbf52fa631 (patch)
tree5516f40e7db5a91c541443405ae8e08f25a78c80 /clientloop.c
parentc44d8ebdba6f7c128fb9a22f9aa7f207cc1383f4 (diff)
Reduce severity of "Killed by signal %d"
This produces irritating messages when using ProxyCommand or other programs that use ssh under the covers (e.g. Subversion). These messages are more normally printed by the calling program, such as the shell. According to the upstream bug, the right way to avoid this is to use the -q option, so we may drop this patch after further investigation into whether any software in Debian is still relying on it. Author: Colin Watson <cjwatson@debian.org> Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1118 Bug-Debian: http://bugs.debian.org/313371 Last-Update: 2013-09-14 Patch-Name: quieter-signals.patch
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c
index fba1b5496..5653cc489 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1716,8 +1716,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1716 exit_status = 0; 1716 exit_status = 0;
1717 } 1717 }
1718 1718
1719 if (received_signal) 1719 if (received_signal) {
1720 fatal("Killed by signal %d.", (int) received_signal); 1720 debug("Killed by signal %d.", (int) received_signal);
1721 cleanup_exit((int) received_signal + 128);
1722 }
1721 1723
1722 /* 1724 /*
1723 * In interactive mode (with pseudo tty) display a message indicating 1725 * In interactive mode (with pseudo tty) display a message indicating