diff options
| author | Rodrigo Moya <rodrigo.moya@collabora.co.uk> | 2012-06-18 11:53:09 +0200 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2012-06-18 11:53:09 +0200 |
| commit | 103987609a88e04f63a8626d84276aa208f6bb65 (patch) | |
| tree | 8557365614a69cda87a7bc467b9dd4d1de431a06 | |
| parent | 837b047e3246c638d9c1085cd5b8e0a022328db2 (diff) | |
| download | dbus-103987609a88e04f63a8626d84276aa208f6bb65.tar.gz | |
Never use afbus system socket by default, use <listen_if_possible>
| -rw-r--r-- | bus/system.conf.in | 1 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/bus/system.conf.in b/bus/system.conf.in index 92f4cc42..515509f4 100644 --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -39,6 +39,7 @@ means use abstract namespace, don't really create filesystem file; only Linux supports this. Use path=/whatever on other systems.) --> + <listen_if_possible>afbus:@DBUS_SYSTEM_SOCKET@.afbus</listen_if_possible> <listen>@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@</listen> <policy context="default"> diff --git a/configure.ac b/configure.ac index 27604d75..2782df78 100644 --- a/configure.ac +++ b/configure.ac @@ -1517,11 +1517,7 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_SOCKET,"$DBUS_SYSTEM_SOCKET",[The name of the soc ## system bus only listens on local domain sockets, and never ## on an abstract socket (so only root can create the socket) -if test x$have_afbus = xyes; then - DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="afbus:path=$DBUS_SYSTEM_SOCKET" -else - DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=$DBUS_SYSTEM_SOCKET" -fi +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]) |