Mercurial > dropbear
changeset 657:16af1decaf4c
- Merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Tue, 21 Feb 2012 23:00:30 +0800 |
parents | 67fbba2c2a85 (diff) 818108bf7749 (current diff) |
children | d4d0279710b9 |
files | dbutil.c svr-chansession.c |
diffstat | 3 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/dbutil.c Sun Dec 04 05:31:25 2011 +0800 +++ b/dbutil.c Tue Feb 21 23:00:30 2012 +0800 @@ -824,7 +824,7 @@ if (data == NULL) return; while (len--) { - *p++ = 0x66; + *p++ = 0x0; } }
--- a/svr-chansession.c Sun Dec 04 05:31:25 2011 +0800 +++ b/svr-chansession.c Tue Feb 21 23:00:30 2012 +0800 @@ -137,6 +137,7 @@ 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")) }
--- a/svr-main.c Sun Dec 04 05:31:25 2011 +0800 +++ b/svr-main.c Tue Feb 21 23:00:30 2012 +0800 @@ -370,6 +370,7 @@ /* 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"); }