2004-02-24 Joe Shaw <joe@ximian.com>

	* bus/services.c (bus_registry_acquire_service): We need to pass
	in the service name to dbus_set_error() to prevent a crash.

diff --git a/ChangeLog b/ChangeLog
index cbd21b5..af872a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-24  Joe Shaw  <joe@ximian.com>
+
+       * bus/services.c (bus_registry_acquire_service): We need to pass
+       in the service name to dbus_set_error() to prevent a crash.
+
 2003-12-26  Anders Carlsson  <andersca@gnome.org>
 
        * AUTHORS: Reveal my True identity.

diff --git a/bus/services.c b/bus/services.c
index dc251b9..ae7b783 100644 (file)
--- a/bus/services.c
+++ b/bus/services.c
@@ -299,7 +299,8 @@ bus_registry_acquire_service (BusRegistry      *registry,
                       "to security policies in the configuration file",
                       bus_connection_is_active (connection) ?
                       bus_connection_get_name (connection) :
-                      "(inactive)");
+                      "(inactive)",
+                     service_name);
       goto out;
     }