From: Joe Shaw <joeshaw@novell.com>
Date: Tue, 24 Feb 2004 19:50:25 +0000 (+0000)
Subject: 2004-02-24  Joe Shaw  <joe@ximian.com>
X-Git-Tag: dbus-0.21~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47d8e53bfeccc6f90475408bfbef9c0132a4122f;p=thirdparty%2Fdbus.git

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 cbd21b510..af872a977 100644
--- 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 dc251b932..ae7b7838f 100644
--- 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;
     }