tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/09/20 04:41:47 

[ssh.c]
     install a SIGCHLD handler to reap expiried child process; ok markus@
This commit is contained in:
Damien Miller 2010-09-24 22:02:56 +10:00
parent 881adf74eb
commit 857b02e37f
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@
- jmc@cvs.openbsd.org 2010/09/19 21:30:05 - jmc@cvs.openbsd.org 2010/09/19 21:30:05
[sftp.1] [sftp.1]
more wacky macro fixing; more wacky macro fixing;
- djm@cvs.openbsd.org 2010/09/20 04:41:47
[ssh.c]
install a SIGCHLD handler to reap expiried child process; ok markus@
20100910 20100910
- (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact

21
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.351 2010/09/02 16:08:39 markus Exp $ */ /* $OpenBSD: ssh.c,v 1.352 2010/09/20 04:41:47 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -50,6 +50,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
@ -210,6 +211,7 @@ usage(void)
static int ssh_session(void); static int ssh_session(void);
static int ssh_session2(void); static int ssh_session2(void);
static void load_public_identity_files(void); static void load_public_identity_files(void);
static void main_sigchld_handler(int);
/* from muxclient.c */ /* from muxclient.c */
void muxclient(const char *); void muxclient(const char *);
@ -877,6 +879,7 @@ main(int ac, char **av)
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 */ signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
signal(SIGCHLD, main_sigchld_handler);
/* Log into the remote system. Never returns if the login fails. */ /* Log into the remote system. Never returns if the login fails. */
ssh_login(&sensitive_data, host, (struct sockaddr *)&hostaddr, ssh_login(&sensitive_data, host, (struct sockaddr *)&hostaddr,
@ -1545,3 +1548,19 @@ load_public_identity_files(void)
bzero(pwdir, strlen(pwdir)); bzero(pwdir, strlen(pwdir));
xfree(pwdir); xfree(pwdir);
} }
static void
main_sigchld_handler(int sig)
{
int save_errno = errno;
pid_t pid;
int status;
while ((pid = waitpid(-1, &status, WNOHANG)) > 0 ||
(pid < 0 && errno == EINTR))
;
signal(sig, main_sigchld_handler);
errno = save_errno;
}