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>2014-02-09 23:43:40 +0000
commit360257b8a56798d507123ff770f2def408464f00 (patch)
tree6d5a4674e3d801aeb206f7c02fe4cb6ceb7ac3e1 /clientloop.c
parentb8a355b5db58dc489fca181e333dacf5e14f4f1d (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 dc76d6960..f2f474eab 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1717,8 +1717,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1717 exit_status = 0; 1717 exit_status = 0;
1718 } 1718 }
1719 1719
1720 if (received_signal) 1720 if (received_signal) {
1721 fatal("Killed by signal %d.", (int) received_signal); 1721 debug("Killed by signal %d.", (int) received_signal);
1722 cleanup_exit((int) received_signal + 128);
1723 }
1722 1724
1723 /* 1725 /*
1724 * In interactive mode (with pseudo tty) display a message indicating 1726 * In interactive mode (with pseudo tty) display a message indicating