diff options
author | Colin Watson <cjwatson@debian.org> | 2005-11-27 11:09:39 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-11-27 11:09:39 +0000 |
commit | 3f69bc1f408f63eec435ea7cf3a8c79a5911f1ed (patch) | |
tree | 88c2770bdd4d2f32f9faaed93a59dc99facee8b8 | |
parent | bfbf46f18409500bdcfb11689c61e14674ff14aa (diff) |
* When the client receives a signal, don't fatal() with "Killed by signal
%d." (which produces unhelpful noise on stderr and causes confusion for
users of some applications that wrap ssh); instead, generate a debug
message and exit with the traditional status (closes: #313371).
-rw-r--r-- | clientloop.c | 6 | ||||
-rw-r--r-- | debian/changelog | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index c9176c0d7..6a35c8e3e 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1505,8 +1505,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1505 | exit_status = 0; | 1505 | exit_status = 0; |
1506 | } | 1506 | } |
1507 | 1507 | ||
1508 | if (received_signal) | 1508 | if (received_signal) { |
1509 | fatal("Killed by signal %d.", (int) received_signal); | 1509 | debug("Killed by signal %d.", (int) received_signal); |
1510 | cleanup_exit((int) received_signal + 128); | ||
1511 | } | ||
1510 | 1512 | ||
1511 | /* | 1513 | /* |
1512 | * In interactive mode (with pseudo tty) display a message indicating | 1514 | * In interactive mode (with pseudo tty) display a message indicating |
diff --git a/debian/changelog b/debian/changelog index f6a78859e..68e6123f6 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -2,6 +2,10 @@ openssh (1:4.2p1-6) UNRELEASED; urgency=low | |||
2 | 2 | ||
3 | * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11 | 3 | * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11 |
4 | to the normal and superuser paths and /usr/games to the normal path. | 4 | to the normal and superuser paths and /usr/games to the normal path. |
5 | * When the client receives a signal, don't fatal() with "Killed by signal | ||
6 | %d." (which produces unhelpful noise on stderr and causes confusion for | ||
7 | users of some applications that wrap ssh); instead, generate a debug | ||
8 | message and exit with the traditional status (closes: #313371). | ||
5 | * debconf template translations: | 9 | * debconf template translations: |
6 | - Add Swedish (thanks, Daniel Nylander; closes: #333133). | 10 | - Add Swedish (thanks, Daniel Nylander; closes: #333133). |
7 | 11 | ||