diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | bus/Makefile.am | 2 | ||||
| -rw-r--r-- | bus/session.conf.in | 2 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.c | 1 |
5 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2004-10-25 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 + 2004-10-21 Colin Walters <walters@verbum.org> * AUTHORS: Fix my email address, the @gnu.org one 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 --> diff --git a/configure.in b/configure.in index ea25336d..e9c6c100 100644 --- a/configure.in +++ b/configure.in @@ -984,6 +984,10 @@ LIBDIR_TMP="$libdir" EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP` AC_SUBST(EXPANDED_LIBDIR) +DATADIR_TMP="$datadir" +EXPANDED_DATADIR=`eval echo $DATADIR_TMP` +AC_SUBST(EXPANDED_DATADIR) + ## put prefix and exec_prefix back prefix=$old_prefix exec_prefix=$old_exec_prefix @@ -1168,6 +1172,7 @@ echo " bindir: ${EXPANDED_BINDIR} sysconfdir: ${EXPANDED_SYSCONFDIR} localstatedir: ${EXPANDED_LOCALSTATEDIR} + datadir: ${EXPANDED_DATADIR} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index 80188e48..e1b786f0 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -1566,7 +1566,6 @@ fill_user_info (DBusUserInfo *info, failed: _DBUS_ASSERT_ERROR_IS_SET (error); - _dbus_user_info_free (info); return FALSE; } |