summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'dbus/dbus-bus.c')
-rw-r--r--dbus/dbus-bus.c12
1 files changed, 10 insertions, 2 deletions
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;