From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Sep 2009 20:18:24 +0000 (+0200)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~82
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=91743fc0c8785f84f3976d5f5d430b1b3a7d4918

Merge branch 'collectd-4.8'

Conflicts:
	src/exec.c
---

91743fc0c8785f84f3976d5f5d430b1b3a7d4918
diff --cc src/exec.c
index bbd23df1,8719201e..acc6cf6f
--- a/src/exec.c
+++ b/src/exec.c
@@@ -479,7 -477,9 +488,11 @@@ static int fork_child (program_list_t *
        close (fd_pipe_err[1]);
      }
  
 +    set_environment ();
++
+     /* Unblock all signals */
+     reset_signal_mask ();
+ 
      exec_child (pl);
      /* does not return */
    }