diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | clientloop.c | 3 | ||||
-rw-r--r-- | ssh.c | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -8,6 +8,9 @@ | |||
8 | - markus@cvs.openbsd.org 2001/10/24 08:41:20 | 8 | - markus@cvs.openbsd.org 2001/10/24 08:41:20 |
9 | [ssh.c] | 9 | [ssh.c] |
10 | remove unused | 10 | remove unused |
11 | - markus@cvs.openbsd.org 2001/10/24 08:51:35 | ||
12 | [clientloop.c ssh.c] | ||
13 | ignore SIGPIPE early, makes ssh work if agent dies, netbsd-pr via itojun@ | ||
11 | 14 | ||
12 | 20011109 | 15 | 20011109 |
13 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) | 16 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) |
@@ -6817,4 +6820,4 @@ | |||
6817 | - Wrote replacements for strlcpy and mkdtemp | 6820 | - Wrote replacements for strlcpy and mkdtemp |
6818 | - Released 1.0pre1 | 6821 | - Released 1.0pre1 |
6819 | 6822 | ||
6820 | $Id: ChangeLog,v 1.1636 2001/11/11 23:51:40 djm Exp $ | 6823 | $Id: ChangeLog,v 1.1637 2001/11/11 23:52:03 djm Exp $ |
diff --git a/clientloop.c b/clientloop.c index 0e477bc79..7e6fe269a 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.84 2001/10/11 15:24:00 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.85 2001/10/24 08:51:35 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -820,7 +820,6 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
820 | signal(SIGINT, signal_handler); | 820 | signal(SIGINT, signal_handler); |
821 | signal(SIGQUIT, signal_handler); | 821 | signal(SIGQUIT, signal_handler); |
822 | signal(SIGTERM, signal_handler); | 822 | signal(SIGTERM, signal_handler); |
823 | signal(SIGPIPE, SIG_IGN); | ||
824 | if (have_pty) | 823 | if (have_pty) |
825 | signal(SIGWINCH, window_change_handler); | 824 | signal(SIGWINCH, window_change_handler); |
826 | 825 | ||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.148 2001/10/24 08:41:20 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.149 2001/10/24 08:51:35 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -752,6 +752,8 @@ again: | |||
752 | options.user_hostfile2 = | 752 | options.user_hostfile2 = |
753 | tilde_expand_filename(options.user_hostfile2, original_real_uid); | 753 | tilde_expand_filename(options.user_hostfile2, original_real_uid); |
754 | 754 | ||
755 | signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */ | ||
756 | |||
755 | /* Log into the remote system. This never returns if the login fails. */ | 757 | /* Log into the remote system. This never returns if the login fails. */ |
756 | ssh_login(sensitive_data.keys, sensitive_data.nkeys, | 758 | ssh_login(sensitive_data.keys, sensitive_data.nkeys, |
757 | host, (struct sockaddr *)&hostaddr, pw); | 759 | host, (struct sockaddr *)&hostaddr, pw); |