From 4612de0198e3417ca710be2bd0c27f4445c6766a Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Mon, 25 Oct 2004 18:48:58 +0000
Subject: John (J5) Palmieri  <johnp@redhat.com>

        * dbus/dbus-sysdeps.c (fill_user_info): On errors do not free
        the DBusUserInfo structure since this is passed into the function.
        This would cause a double free when the function that allocated
        the structure would try to free it when an error occured.

        * (bus/session.conf.in, bus/Makefile.am, dbus/configure.in):
        use /usr/share/dbus-1/services instead of /usr/lib/dbus-1.0/services
        for service activation to avoid 32bit/64bit parallel install issues
---
 bus/session.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bus/session.conf.in')

diff --git a/bus/session.conf.in b/bus/session.conf.in
index a537d9dc..8b6d65f7 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -10,7 +10,7 @@
 
   <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
 
-  <servicedir>@EXPANDED_LIBDIR@/dbus-1.0/services</servicedir>
+  <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir>
 
   <policy context="default">
     <!-- Allow everything to be sent -->
-- 
cgit v1.2.3