tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Pull out our own SIGPIPE hacks

Browse Source
This commit is contained in:
Damien Miller 2001-03-24 15:39:38 +11:00
parent de71cda078
commit b44fe0617d
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -13,6 +13,7 @@
- markus@cvs.openbsd.org 2001/03/23 14:28:32 - markus@cvs.openbsd.org 2001/03/23 14:28:32
[session.c sshd.c] [session.c sshd.c]
ignore SIGPIPE, restore in child, fixes x11-fwd crashes; with djm@ ignore SIGPIPE, restore in child, fixes x11-fwd crashes; with djm@
- (djm) Pull out our own SIGPIPE hacks
20010323 20010323
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4704,4 +4705,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1014 2001/03/24 00:43:26 mouring Exp $ $Id: ChangeLog,v 1.1015 2001/03/24 04:39:38 djm Exp $

2
serverloop.c
View File

@ -420,7 +420,6 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
child_pid = pid; child_pid = pid;
child_terminated = 0; child_terminated = 0;
signal(SIGCHLD, sigchld_handler); signal(SIGCHLD, sigchld_handler);
signal(SIGPIPE, SIG_IGN);
/* Initialize our global variables. */ /* Initialize our global variables. */
fdin = fdin_arg; fdin = fdin_arg;
@ -655,7 +654,6 @@ server_loop2(void)
debug("Entering interactive session for SSH2."); debug("Entering interactive session for SSH2.");
mysignal(SIGCHLD, sigchld_handler2); mysignal(SIGCHLD, sigchld_handler2);
signal(SIGPIPE, SIG_IGN);
child_terminated = 0; child_terminated = 0;
connection_in = packet_get_connection_in(); connection_in = packet_get_connection_in();
connection_out = packet_get_connection_out(); connection_out = packet_get_connection_out();

4
session.c
View File

@ -496,8 +496,6 @@ do_exec_no_pty(Session *s, const char *command)
/* Child. Reinitialize the log since the pid has changed. */ /* Child. Reinitialize the log since the pid has changed. */
log_init(__progname, options.log_level, options.log_facility, log_stderr); log_init(__progname, options.log_level, options.log_facility, log_stderr);
signal(SIGPIPE, SIG_DFL);
/* /*
* Create a new session and process group since the 4.4BSD * Create a new session and process group since the 4.4BSD
* setlogin() affects the entire process group. * setlogin() affects the entire process group.
@ -613,8 +611,6 @@ do_exec_pty(Session *s, const char *command)
/* Child. Reinitialize the log because the pid has changed. */ /* Child. Reinitialize the log because the pid has changed. */
log_init(__progname, options.log_level, options.log_facility, log_stderr); log_init(__progname, options.log_level, options.log_facility, log_stderr);
signal(SIGPIPE, SIG_DFL);
/* Close the master side of the pseudo tty. */ /* Close the master side of the pseudo tty. */
close(ptyfd); close(ptyfd);