r7431: this should fix the bug that mkaplan and I noticed which is that

BENCH-NBENCH sometimes incorrectly reports that it failed.
(This used to be commit 167c29bec6f28e58b5d36325b4285748a47adc58)

1 files changed, 8 insertions, 0 deletions

diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 8e19461b955..9b3c9cdb5ac 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -198,6 +198,14 @@ BOOL torture_nbench(void)
 	printf("Running for %d seconds with load '%s' and warmup %d secs\n", 
 	       timelimit, loadfile, warmup);
 
+	/* we need to reset SIGCHLD here as the name resolution
+	   library may have changed it. We rely on correct signals
+	   from childs in the main torture code which reaps
+	   children. This is why smbtorture BENCH-NBENCH was sometimes
+	   failing */
+	signal(SIGCHLD, SIG_DFL);
+
+
 	signal(SIGALRM, nb_alarm);
 	alarm(1);
 	torture_create_procs(run_netbench, &correct);