diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | bus/system.conf.in | 2 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | dbus/Makefile.am | 3 | ||||
| -rw-r--r-- | dbus/dbus-bus.c | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 12 |
7 files changed, 50 insertions, 15 deletions
@@ -1,3 +1,22 @@ +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 + 2003-08-09 Anders Carlsson <andersca@codefactory.se> * doc/TODO: @@ -1,3 +1,16 @@ +D-BUS 0.13 +=== + +This is probably the last release before landing the large API changes +on the "dbus-object-names" branch. + +- fix system bus to always use filesystem socket; anyone + can create any abstract socket, which isn't secure + since if you can crash the system bus you'd be able + to replace it. +- add DTD for configuration file +- improve specification a bit + D-BUS 0.12 === diff --git a/bus/system.conf.in b/bus/system.conf.in index bd454ff3..476a87a6 100644 --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -30,7 +30,7 @@ means use abstract namespace, don't really create filesystem file; only Linux supports this. Use path=/whatever on other systems.) --> - <listen>unix:@DBUS_PATH_OR_ABSTRACT@=@DBUS_SYSTEM_SOCKET@</listen> + <listen>@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@</listen> <policy context="default"> <!-- Deny everything then punch holes --> diff --git a/configure.in b/configure.in index 0923273f..0a5928a2 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ(2.52) AC_INIT(dbus/dbus.h) -AM_INIT_AUTOMAKE(dbus, 0.12) +AM_INIT_AUTOMAKE(dbus, 0.13) AM_CONFIG_HEADER(config.h) @@ -750,6 +750,13 @@ else fi AC_SUBST(DBUS_SYSTEM_SOCKET) +AC_DEFINE_UNQUOTED(DBUS_SYSTEM_SOCKET,"$DBUS_SYSTEM_SOCKET",[The name of the socket the system bus listens on by default]) + +## system bus only listens on local domain sockets, and never +## on an abstract socket (so only root can create the socket) +DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=$DBUS_SYSTEM_SOCKET" +AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS) +AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS, "$DBUS_SYSTEM_BUS_DEFAULT_ADDRESS",[The default D-BUS address of the system bus]) #### Set up the pid file if ! test -z "$with_system_pid_file"; then @@ -894,6 +901,7 @@ echo " Init scripts style: ${with_init_scripts} Abstract socket names: ${have_abstract_sockets} System bus socket: ${DBUS_SYSTEM_SOCKET} + System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} System bus PID file: ${DBUS_SYSTEM_PID_FILE} Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR} 'make check' socket dir: ${TEST_SOCKET_DIR} 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; } diff --git a/doc/Makefile.am b/doc/Makefile.am index 891c0209..5ee7cb9f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,15 +11,15 @@ all-local: dbus-specification.html dbus-test-plan.html endif dbus-specification.html: dbus-specification.sgml - $(DB2HTML) -o . --nochunks $< && \ - rm -r $(srcdir)/dbus-specification/stylesheet-images && \ - (if test -d $(srcdir)/dbus-specification ; then \ + $(DB2HTML) -o . --nochunks $< && \ + rm -rf $(srcdir)/dbus-specification/stylesheet-images && \ + (if test -d $(srcdir)/dbus-specification ; then \ rmdir $(srcdir)/dbus-specification ; fi) dbus-test-plan.html: dbus-test-plan.sgml - $(DB2HTML) -o . --nochunks $< && \ - rm -r $(srcdir)/dbus-test-plan/stylesheet-images && \ - (if test -d $(srcdir)/dbus-test-plan ; then \ + $(DB2HTML) -o . --nochunks $< && \ + rm -rf $(srcdir)/dbus-test-plan/stylesheet-images && \ + (if test -d $(srcdir)/dbus-test-plan ; then \ rmdir $(srcdir)/dbus-test-plan ; fi) maintainer-clean-local: |