From: John (J5) Palmieri <johnp@redhat.com>
Date: Thu, 7 Sep 2006 18:28:13 +0000 (+0000)
Subject: * dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): Make sure we
X-Git-Tag: dbus-0.93~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b178a2223ce78017978228fee1ce56c94c032d;p=thirdparty%2Fdbus.git

* 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>)
---

diff --git a/ChangeLog b/ChangeLog
index 31dcbb9d2..a8f00bfab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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 
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 508bbdca3..f01ada27f 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;