2005-05-08 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-sysdeps-util.c (_dbus_become_daemon): write the
	daemon's pid, not the parent's pid, to the file descriptor.
	Reported by Taj Morton.

diff --git a/ChangeLog b/ChangeLog
index 1fbbf85..0c7f6a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-08  Havoc Pennington  <hp@redhat.com>
+
+       * dbus/dbus-sysdeps-util.c (_dbus_become_daemon): write the
+       daemon's pid, not the parent's pid, to the file descriptor.
+       Reported by Taj Morton.
+
 2005-05-05  Havoc Pennington  <hp@redhat.com>
 
        * configure.in (LT_*): add notes on how the libtool versioning

diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c
index 5c9921e..68c2a70 100644 (file)
--- a/dbus/dbus-sysdeps-util.c
+++ b/dbus/dbus-sysdeps-util.c
@@ -56,7 +56,7 @@
  * Does the chdir, fork, setsid, etc. to become a daemon process.
  *
  * @param pidfile #NULL, or pidfile to create
- * @param print_pid_fd file descriptor to print pid to, or -1 for none
+ * @param print_pid_fd file descriptor to print daemon's pid to, or -1 for none
  * @param error return location for errors
  * @returns #FALSE on failure
  */
@@ -142,7 +142,7 @@ _dbus_become_daemon (const DBusString *pidfile,
              return FALSE;
            }
          
-         if (!_dbus_string_append_int (&pid, _dbus_getpid ()) ||
+         if (!_dbus_string_append_int (&pid, child_pid) ||
              !_dbus_string_append (&pid, "\n"))
            {
              _dbus_string_free (&pid);