author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200) |
Conflicts:
src/exec.c
src/exec.c
1 | 2 | |||
---|---|---|---|---|
configure.in | patch | | diff1 | | diff2 | | blob | history |
src/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
src/curl.c | patch | | diff1 | | diff2 | | blob | history |
src/exec.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/curl.c
Simple merge
diff --cc src/exec.c
index bbd23df13b4d3f3afb8422d6b447aece3a5657cb,8719201ea956fe3129561889191fddab3f047a35..acc6cf6f12aa93ea7fc743e78cc378acaf78c29a
--- 1/src/exec.c
--- 2/src/exec.c
+++ b/src/exec.c
close (fd_pipe_err[1]);
}
+ set_environment ();
++
+ /* Unblock all signals */
+ reset_signal_mask ();
+
exec_child (pl);
/* does not return */
}