From 29c71168cd17b11eed65023c97aff401d5305b01 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 31 Mar 2003 08:19:50 +0000 Subject: 2003-03-31 Havoc Pennington * dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket) (_dbus_transport_new_for_tcp_socket): these didn't need the "server" argument since they are always client side * dbus/dbus-server.c (dbus_server_get_address): new function * bus/main.c (main): take the configuration file as an argument. * test/data/valid-config-files/debug-allow-all.conf: new file to use with dispatch.c tests for example * bus/test-main.c (main): require test data dir * bus/bus.c (bus_context_new): change this to take a configuration file name as argument * doc/config-file.txt (Elements): add * bus/system.conf, bus/session.conf: new files * dbus/dbus-bus.c (dbus_bus_get): look for system bus on well-known socket if none set * configure.in: create system.conf and session.conf --- dbus/dbus-bus.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'dbus/dbus-bus.c') diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index c3978db2..22af3dab 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -221,10 +221,18 @@ dbus_bus_get (DBusBusType type, value = _dbus_getenv (name); - if (!value) + if (type == DBUS_BUS_SYSTEM && + (value == NULL || *value == '\0')) + { + /* Use default system bus address if none set */ + value = "unix:path=" DBUS_SYSTEM_BUS_PATH; + } + + if (value == NULL || *value == '\0') { dbus_set_error (error, DBUS_ERROR_FAILED, - "Could not get bus daemon address."); + "Environment variable %s not set, address of message bus unknown", + name); _DBUS_UNLOCK (bus); return NULL; -- cgit