From 4612de0198e3417ca710be2bd0c27f4445c6766a Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Mon, 25 Oct 2004 18:48:58 +0000 Subject: John (J5) Palmieri * 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/Makefile.am | 2 +- bus/session.conf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bus') diff --git a/bus/Makefile.am b/bus/Makefile.am index a9761be5..218c6a5f 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -92,7 +92,7 @@ clean-local: install-data-hook: $(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus $(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)/$(libdir)/dbus-1.0/services + $(mkinstalldirs) $(DESTDIR)/$(datadir)/dbus-1/services #### Init scripts fun SCRIPT_IN_FILES=messagebus.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 @@ unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@ - @EXPANDED_LIBDIR@/dbus-1.0/services + @EXPANDED_DATADIR@/dbus-1/services -- cgit