dbus/dbus Makefile.am,1.55,1.56 dbus-bus.c,1.23,1.24

[Havoc Pennington]

Update of /cvs/dbus/dbus/dbus
In directory pdx:/tmp/cvs-serv21616/dbus

Modified Files:
	Makefile.am dbus-bus.c 
Log Message:
2003-09-28  Havoc Pennington  <hp@pobox.com>

	* configure.in: 0.13

	* doc/Makefile.am (dbus-test-plan.html): accept nonexistence of
	stylesheet-images for benefit of Debian
	
	Change back to using filesystem-linked sockets for the system
	bus, so only root can create the default system bus address.
	
	* bus/system.conf.in: change to use
	DBUS_SYSTEM_BUS_DEFAULT_ADDRESS

	* dbus/Makefile.am (INCLUDES): remove DBUS_SYSTEM_BUS_PATH define
	from here.

	* configure.in: define DBUS_SYSTEM_BUS_DEFAULT_ADDRESS
	here, and AC_DEFINE DBUS_SYSTEM_PATH



Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/dbus/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Makefile.am	15 May 2003 19:59:19 -0000	1.55
+++ Makefile.am	29 Sep 2003 01:43:52 -0000	1.56
@@ -1,6 +1,5 @@
 
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION		\
-	-DDBUS_SYSTEM_BUS_PATH=\""@DBUS_SYSTEM_SOCKET@"\"
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
 
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus

Index: dbus-bus.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-bus.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dbus-bus.c	30 Jul 2003 20:14:07 -0000	1.23
+++ dbus-bus.c	29 Sep 2003 01:43:52 -0000	1.24
@@ -146,11 +146,7 @@
              {
                /* Use default system bus address if none set in environment */
                bus_connection_addresses[DBUS_BUS_SYSTEM] =
-#ifdef HAVE_ABSTRACT_SOCKETS
-                 _dbus_strdup ("unix:abstract=" DBUS_SYSTEM_BUS_PATH);
-#else
-                 _dbus_strdup ("unix:path=" DBUS_SYSTEM_BUS_PATH);
-#endif
+                 _dbus_strdup (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
                if (bus_connection_addresses[DBUS_BUS_SYSTEM] == NULL)
                  return FALSE;
              }