diff options
author | Matt Johnston <matt@ucc.asn.au> | 2012-02-21 23:00:30 +0800 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2012-02-21 23:00:30 +0800 |
commit | 4eda4dae82d088bfea9818fc14ad10a83188bd72 (patch) | |
tree | 937c08f224f1654632ce4e048355dbe686968096 | |
parent | 79e50947f2a6d5638c8e24cb6e90eb2e6d1665c4 (diff) | |
parent | 616d66083979b03d73a46dffab435546c0160d13 (diff) | |
download | dropbear-4eda4dae82d088bfea9818fc14ad10a83188bd72.tar.gz |
- Merge
-rw-r--r-- | dbutil.c | 2 | ||||
-rw-r--r-- | svr-chansession.c | 1 | ||||
-rw-r--r-- | svr-main.c | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -824,7 +824,7 @@ void m_burn(void *data, unsigned int len) { if (data == NULL) return; while (len--) { - *p++ = 0x66; + *p++ = 0x0; } } diff --git a/svr-chansession.c b/svr-chansession.c index 53790d1..4d6d4fe 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -137,6 +137,7 @@ static void sesssigchild_handler(int UNUSED(dummy)) { sa_chld.sa_handler = sesssigchild_handler; sa_chld.sa_flags = SA_NOCLDSTOP; + sa_chld.sa_mask = 0; sigaction(SIGCHLD, &sa_chld, NULL); TRACE(("leave sigchld handler")) } @@ -370,6 +370,7 @@ static void commonsetup() { /* catch and reap zombie children */ sa_chld.sa_handler = sigchld_handler; sa_chld.sa_flags = SA_NOCLDSTOP; + sa_chld.sa_mask = 0; if (sigaction(SIGCHLD, &sa_chld, NULL) < 0) { dropbear_exit("signal() error"); } |