diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | ssh.c | 3 |
3 files changed, 10 insertions, 3 deletions
@@ -8,6 +8,10 @@ | |||
8 | .Xsession -> .xsession; | 8 | .Xsession -> .xsession; |
9 | originally from a pr from f at obiit dot org, but missed by myself; | 9 | originally from a pr from f at obiit dot org, but missed by myself; |
10 | ok markus@ matthieu@ | 10 | ok markus@ matthieu@ |
11 | - djm@cvs.openbsd.org 2004/09/07 23:41:30 | ||
12 | [clientloop.c ssh.c] | ||
13 | cleanup multiplex control socket on SIGHUP too, spotted by sturm@ | ||
14 | ok markus@ deraadt@ | ||
11 | 15 | ||
12 | 20041102 | 16 | 20041102 |
13 | - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX | 17 | - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX |
@@ -1787,4 +1791,4 @@ | |||
1787 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1791 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1788 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1792 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1789 | 1793 | ||
1790 | $Id: ChangeLog,v 1.3564 2004/11/05 09:01:03 dtucker Exp $ | 1794 | $Id: ChangeLog,v 1.3565 2004/11/05 09:02:16 dtucker Exp $ |
diff --git a/clientloop.c b/clientloop.c index 0b9a0fb29..49f9ba1ab 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.130 2004/08/11 21:43:04 avsm Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.131 2004/09/07 23:41:30 djm Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1196,6 +1196,8 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1196 | * Set signal handlers, (e.g. to restore non-blocking mode) | 1196 | * Set signal handlers, (e.g. to restore non-blocking mode) |
1197 | * but don't overwrite SIG_IGN, matches behaviour from rsh(1) | 1197 | * but don't overwrite SIG_IGN, matches behaviour from rsh(1) |
1198 | */ | 1198 | */ |
1199 | if (signal(SIGHUP, SIG_IGN) != SIG_IGN) | ||
1200 | signal(SIGHUP, signal_handler); | ||
1199 | if (signal(SIGINT, SIG_IGN) != SIG_IGN) | 1201 | if (signal(SIGINT, SIG_IGN) != SIG_IGN) |
1200 | signal(SIGINT, signal_handler); | 1202 | signal(SIGINT, signal_handler); |
1201 | if (signal(SIGQUIT, SIG_IGN) != SIG_IGN) | 1203 | if (signal(SIGQUIT, SIG_IGN) != SIG_IGN) |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.225 2004/08/23 14:26:38 dtucker Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.226 2004/09/07 23:41:30 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -1325,6 +1325,7 @@ control_client(const char *path) | |||
1325 | fatal("%s: master returned error", __func__); | 1325 | fatal("%s: master returned error", __func__); |
1326 | buffer_free(&m); | 1326 | buffer_free(&m); |
1327 | 1327 | ||
1328 | signal(SIGHUP, control_client_sighandler); | ||
1328 | signal(SIGINT, control_client_sighandler); | 1329 | signal(SIGINT, control_client_sighandler); |
1329 | signal(SIGTERM, control_client_sighandler); | 1330 | signal(SIGTERM, control_client_sighandler); |
1330 | signal(SIGWINCH, control_client_sigrelay); | 1331 | signal(SIGWINCH, control_client_sigrelay); |