summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-09-07 18:28:13 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-09-07 18:28:13 +0000
commit14b178a2223ce78017978228fee1ce56c94c032d (patch)
tree590ef61aa3cd01d8e04435fb42c1c5b0b0f4c776
parentd3ae8527461b48a00a153d511c57952a8197c921 (diff)
* dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): Make sure we
close child_err_report_pipe[WRITE_END] on exec (Patch from Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>)
-rw-r--r--ChangeLog6
-rw-r--r--dbus/dbus-spawn.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 31dcbb9d..a8f00bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-09-07 John (J5) Palmieri <johnp@redhat.com>
+ * dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): Make sure we
+ close child_err_report_pipe[WRITE_END] on exec (Patch from
+ Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>)
+
+2006-09-07 John (J5) Palmieri <johnp@redhat.com>
+
* Clean up close calls to use _dbus_close (Patch from
Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>)
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 508bbdca..f01ada27 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -1061,7 +1061,8 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
goto cleanup_and_fail;
_dbus_fd_set_close_on_exec (child_err_report_pipe[READ_END]);
-
+ _dbus_fd_set_close_on_exec (child_err_report_pipe[WRITE_END]);
+
if (!_dbus_full_duplex_pipe (&babysitter_pipe[0], &babysitter_pipe[1], TRUE, error))
goto cleanup_and_fail;