Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200)
Conflicts:
src/exec.c

1  2 
configure.in
src/Makefile.am
src/collectd.conf.pod
src/curl.c
src/exec.c

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
diff --cc src/curl.c
Simple merge
diff --cc 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 */
    }