mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-02-04 16:11:39 +00:00
- markus@cvs.openbsd.org 2001/10/24 08:51:35
[clientloop.c ssh.c] ignore SIGPIPE early, makes ssh work if agent dies, netbsd-pr via itojun@
This commit is contained in:
parent
595bb4f572
commit
07cd5897f9
@ -8,6 +8,9 @@
|
|||||||
- markus@cvs.openbsd.org 2001/10/24 08:41:20
|
- markus@cvs.openbsd.org 2001/10/24 08:41:20
|
||||||
[ssh.c]
|
[ssh.c]
|
||||||
remove unused
|
remove unused
|
||||||
|
- markus@cvs.openbsd.org 2001/10/24 08:51:35
|
||||||
|
[clientloop.c ssh.c]
|
||||||
|
ignore SIGPIPE early, makes ssh work if agent dies, netbsd-pr via itojun@
|
||||||
|
|
||||||
20011109
|
20011109
|
||||||
- (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
|
- (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
|
||||||
@ -6817,4 +6820,4 @@
|
|||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1636 2001/11/11 23:51:40 djm Exp $
|
$Id: ChangeLog,v 1.1637 2001/11/11 23:52:03 djm Exp $
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: clientloop.c,v 1.84 2001/10/11 15:24:00 markus Exp $");
|
RCSID("$OpenBSD: clientloop.c,v 1.85 2001/10/24 08:51:35 markus Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
@ -820,7 +820,6 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
|
|||||||
signal(SIGINT, signal_handler);
|
signal(SIGINT, signal_handler);
|
||||||
signal(SIGQUIT, signal_handler);
|
signal(SIGQUIT, signal_handler);
|
||||||
signal(SIGTERM, signal_handler);
|
signal(SIGTERM, signal_handler);
|
||||||
signal(SIGPIPE, SIG_IGN);
|
|
||||||
if (have_pty)
|
if (have_pty)
|
||||||
signal(SIGWINCH, window_change_handler);
|
signal(SIGWINCH, window_change_handler);
|
||||||
|
|
||||||
|
4
ssh.c
4
ssh.c
@ -39,7 +39,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: ssh.c,v 1.148 2001/10/24 08:41:20 markus Exp $");
|
RCSID("$OpenBSD: ssh.c,v 1.149 2001/10/24 08:51:35 markus Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
@ -752,6 +752,8 @@ again:
|
|||||||
options.user_hostfile2 =
|
options.user_hostfile2 =
|
||||||
tilde_expand_filename(options.user_hostfile2, original_real_uid);
|
tilde_expand_filename(options.user_hostfile2, original_real_uid);
|
||||||
|
|
||||||
|
signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
|
||||||
|
|
||||||
/* Log into the remote system. This never returns if the login fails. */
|
/* Log into the remote system. This never returns if the login fails. */
|
||||||
ssh_login(sensitive_data.keys, sensitive_data.nkeys,
|
ssh_login(sensitive_data.keys, sensitive_data.nkeys,
|
||||||
host, (struct sockaddr *)&hostaddr, pw);
|
host, (struct sockaddr *)&hostaddr, pw);
|
||||||
|
Loading…
Reference in New Issue
Block a user