From d4d00020d6ad855d65d31020fefa5003e1bb477f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Tue, 11 Aug 2015 20:46:05 +0200
Subject:  sd-bus: do not connect to dbus-1 socket when kdbus is available

We should not fall back to dbus-1 and connect to the proxy when kdbus
returns an error that indicates that kdbus is running but just does not
accept new connections because of quota limits or something similar.

Using is_kdbus_available() in libsystemd/ requires it to move from
shared/ to libsystemd/.

Based on a patch from David Herrmann:
  https://github.com/systemd/systemd/pull/886
---
 src/core/automount.c | 1 -
 src/core/service.c   | 1 -
 src/core/socket.c    | 1 -
 src/core/timer.c     | 1 -
 4 files changed, 4 deletions(-)

(limited to 'src/core')

diff --git a/src/core/automount.c b/src/core/automount.c
index 4af381b4b6..2b84c441b2 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -39,7 +39,6 @@
 #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 b790ec98be..7bd8cb8b91 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -42,7 +42,6 @@
 #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 a387057473..c78e8ad01b 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -43,7 +43,6 @@
 #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 7f4a2eb716..51cd56ca84 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -27,7 +27,6 @@
 #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,
-- 
cgit v1.2.3-54-g00ecf