dbus/dbus dbus-sysdeps.c,1.80,1.81

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv32362/dbus

Modified Files:
	dbus-sysdeps.c 
Log Message:
John (J5) Palmieri  <johnp at 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


Index: dbus-sysdeps.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- dbus-sysdeps.c	7 Oct 2004 09:56:02 -0000	1.80
+++ dbus-sysdeps.c	25 Oct 2004 18:48:58 -0000	1.81
@@ -1566,7 +1566,6 @@
   
  failed:
   _DBUS_ASSERT_ERROR_IS_SET (error);
-  _dbus_user_info_free (info);
   return FALSE;
 }