summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-08-16 14:34:36 +0200
committerLennart Poettering <lennart@poettering.net>2015-08-16 14:34:36 +0200
commite59679246ef6faf4348e2055db80baa8dec380e5 (patch)
tree47220e36c65d9ecf706cb8fdc0b9b652f1fef421 /src/basic
parentab5838fce7408061514b6322a39b1b5e27cc19b1 (diff)
parentd4d00020d6ad855d65d31020fefa5003e1bb477f (diff)
Merge pull request #932 from kaysievers/bus
sd-bus: do not connect to dbus-1 socket when kdbus is available
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/def.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/basic/def.h b/src/basic/def.h
index 5aaba1fe87..e0d6822f38 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -63,7 +63,6 @@
#define UNIX_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
#define KERNEL_SYSTEM_BUS_ADDRESS "kernel:path=/sys/fs/kdbus/0-system/bus"
-#define DEFAULT_SYSTEM_BUS_ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS
#define UNIX_USER_BUS_ADDRESS_FMT "unix:path=%s/bus"
#define KERNEL_USER_BUS_ADDRESS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"