From: Christian Göttsche <cgzones@googlemail.com>
Date: Tue, 28 Jan 2020 20:25:25 +0000 (+0100)
Subject: core: move bus-util include out of selinux-access header
X-Git-Tag: v245-rc1~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0f765cac8b0801612a6aa52bfe968df4d502abb;p=thirdparty%2Fsystemd.git

core: move bus-util include out of selinux-access header
---

diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index a7d342257b5..6151326f724 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -3,6 +3,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "bus-util.h"
 #include "dbus-job.h"
 #include "dbus-unit.h"
 #include "dbus.h"
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index b45d51f613b..46b6082a25a 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -9,6 +9,7 @@
 #include "architecture.h"
 #include "build.h"
 #include "bus-common-errors.h"
+#include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 73d5b2ee1eb..496fd5eb6a5 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -6,6 +6,7 @@
 #include "bpf-firewall.h"
 #include "bus-common-errors.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "cgroup-util.h"
 #include "condition.h"
 #include "dbus-job.h"
diff --git a/src/core/dbus.c b/src/core/dbus.c
index c86e049c78b..db3148bf4a3 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -11,6 +11,7 @@
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "dbus-automount.h"
 #include "dbus-cgroup.h"
 #include "dbus-device.h"
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 1e75930f571..da2e6cbd740 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -3,7 +3,6 @@
 
 #include "sd-bus.h"
 
-#include "bus-util.h"
 #include "manager.h"
 
 int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error);