# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1329836430 -28800
# Node ID 16af1decaf4cf47ddf0707f882b615bc3c67688f
# Parent  67fbba2c2a851d9efd2a413e8ad8a3b7c21023d7# Parent  818108bf7749bfecd4715a30e2583aac9dbe25e8
- Merge

diff -r 818108bf7749 -r 16af1decaf4c dbutil.c
--- 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;
 	}
 }
 
diff -r 818108bf7749 -r 16af1decaf4c svr-chansession.c
--- 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"))
 }
diff -r 818108bf7749 -r 16af1decaf4c svr-main.c
--- 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");
 	}