Commit 4612de01 authored by John Palmieri's avatar John Palmieri

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
parent 41a9bdeb
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
......
......@@ -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
......
......@@ -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 -->
......
......@@ -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}
......
......@@ -1566,7 +1566,6 @@ fill_user_info (DBusUserInfo *info,
failed:
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_user_info_free (info);
return FALSE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment