diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-09-29 01:43:52 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-09-29 01:43:52 +0000 |
| commit | b99e916792a37e3ed85d15c615eddd2a097e4eff (patch) | |
| tree | 9c272790132a6197633575c52716a6777afaff52 /dbus | |
| parent | 562ad0a174e42749c5cedb65fd1a0a30aec2a6e5 (diff) | |
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
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/Makefile.am | 3 | ||||
| -rw-r--r-- | dbus/dbus-bus.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index eac68c6a..b5fc26ff 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -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 diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index 8ff1298d..865811fd 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -146,11 +146,7 @@ init_connections_unlocked (void) { /* 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; } |