mirror of
https://repo.or.cz/socat.git
synced 2024-12-23 07:52:32 +00:00
Debian bug 531078: socat execs children with SIGCHLD ignored - fixed
This commit is contained in:
parent
6dc9f3fff7
commit
0c8f8a7fc0
2 changed files with 8 additions and 3 deletions
3
CHANGES
3
CHANGES
|
@ -12,6 +12,9 @@ corrections:
|
||||||
fixed a compile problem caused by size_t/socklen_t mismatch on 64bit
|
fixed a compile problem caused by size_t/socklen_t mismatch on 64bit
|
||||||
systems
|
systems
|
||||||
|
|
||||||
|
Debian bug 531078: socat execs children with SIGCHLD ignored; corrected
|
||||||
|
to default. Thanks to Martin Dorey for reporting this bug.
|
||||||
|
|
||||||
docu mentions option so-bindtodev but correct name is so-bindtodevice.
|
docu mentions option so-bindtodev but correct name is so-bindtodevice.
|
||||||
Thanks to Jim Zimmerman for reporting.
|
Thanks to Jim Zimmerman for reporting.
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* source: xio-progcall.c */
|
/* source: xio-progcall.c */
|
||||||
/* Copyright Gerhard Rieger 2001-2009 */
|
/* Copyright Gerhard Rieger 2001-2012 */
|
||||||
/* Published under the GNU General Public License V.2, see file COPYING */
|
/* Published under the GNU General Public License V.2, see file COPYING */
|
||||||
|
|
||||||
/* this file contains common code dealing with program calls (exec, system) */
|
/* this file contains common code dealing with program calls (exec, system) */
|
||||||
|
@ -643,8 +643,10 @@ Warn1("xio-progcall.c: fd->howtoshut == %d", fd->howtoshut);
|
||||||
gid_t group;
|
gid_t group;
|
||||||
|
|
||||||
if (withfork) {
|
if (withfork) {
|
||||||
if (Signal(SIGCHLD, SIG_IGN) == SIG_ERR) {
|
/* The child should have default handling for SIGCHLD. */
|
||||||
Warn1("signal(SIGCHLD, SIG_IGN): %s", strerror(errno));
|
/* In particular, it's not defined whether ignoring SIGCHLD is inheritable. */
|
||||||
|
if (Signal(SIGCHLD, SIG_DFL) == SIG_ERR) {
|
||||||
|
Warn1("signal(SIGCHLD, SIG_DFL): %s", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* dup2() the fds to desired values, close old fds, and apply late
|
/* dup2() the fds to desired values, close old fds, and apply late
|
||||||
|
|
Loading…
Reference in a new issue