diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2004-10-25 18:48:58 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2004-10-25 18:48:58 +0000 |
| commit | 4612de0198e3417ca710be2bd0c27f4445c6766a (patch) | |
| tree | 04fd07452e9bed8256743fcf744974370eaee58e /bus | |
| parent | 41a9bdeba10efe28adc34756535578a38a4db7af (diff) | |
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
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/Makefile.am | 2 | ||||
| -rw-r--r-- | bus/session.conf.in | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ <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 --> |