Revert "sd-bus: do not connect to dbus-1 socket when kdbus is available"

This reverts commit d4d00020d6ad855d65d31020fefa5003e1bb477f. The idea of
the commit is broken and needs to be reworked. We really cannot reduce
the bus-addresses to a single address. We always will have systemd with
native clients and legacy clients at the same time, so we also need both
addresses at the same time.

4 files changed, 4 insertions, 0 deletions

diff --git a/src/core/automount.c b/src/core/automount.c
index 2b84c441b2..4af381b4b6 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -39,6 +39,7 @@
 #include "path-util.h"
 #include "dbus-automount.h"
 #include "bus-util.h"
+#include "bus-error.h"
 #include "formats-util.h"
 #include "process-util.h"
 #include "async.h"
diff --git a/src/core/service.c b/src/core/service.c
index 7bd8cb8b91..b790ec98be 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -42,6 +42,7 @@
 #include "utf8.h"
 #include "env-util.h"
 #include "fileio.h"
+#include "bus-error.h"
 #include "bus-util.h"
 #include "bus-kernel.h"
 #include "formats-util.h"
diff --git a/src/core/socket.c b/src/core/socket.c
index c78e8ad01b..a387057473 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -43,6 +43,7 @@
 #include "def.h"
 #include "smack-util.h"
 #include "bus-util.h"
+#include "bus-error.h"
 #include "selinux-util.h"
 #include "dbus-socket.h"
 #include "unit.h"
diff --git a/src/core/timer.c b/src/core/timer.c
index 7027f83dfd..89758c6b19 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -27,6 +27,7 @@
 #include "dbus-timer.h"
 #include "special.h"
 #include "bus-util.h"
+#include "bus-error.h"
 
 static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
         [TIMER_DEAD] = UNIT_INACTIVE,