Apply the xuser-related policies (if they have been installed by xuser-account) after the service-specific policies are applied.
Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com> --- meta/recipes-core/dbus/dbus.inc | 1 + ...-Apply-xuser-specific-policies-if-present.patch | 33 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-core/dbus/dbus/0001-Apply-xuser-specific-policies-if-present.patch diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 3971081..59e3afe 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -17,6 +17,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://dbus-1.init \ file://os-test.patch \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ + file://0001-Apply-xuser-specific-policies-if-present.patch \ " inherit useradd autotools pkgconfig gettext update-rc.d diff --git a/meta/recipes-core/dbus/dbus/0001-Apply-xuser-specific-policies-if-present.patch b/meta/recipes-core/dbus/dbus/0001-Apply-xuser-specific-policies-if-present.patch new file mode 100644 index 0000000..01a4870 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/0001-Apply-xuser-specific-policies-if-present.patch @@ -0,0 +1,33 @@ +From 3a37ec47ffc9e4d34ac726d649a822cdead1b38f Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukko...@intel.com> +Date: Wed, 30 Sep 2015 11:25:08 +0300 +Subject: [PATCH] Apply xuser-specific policies if present + +system-xuser.conf is installed by xuser-account and contains +policies that override the default service policies (allowing +xuser to send messages to the services). + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com> +--- + bus/system.conf.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/bus/system.conf.in b/bus/system.conf.in +index 851b9e6..1822011 100644 +--- a/bus/system.conf.in ++++ b/bus/system.conf.in +@@ -82,6 +82,10 @@ + holes in the above policy for specific services. --> + <includedir>system.d</includedir> + ++ <!-- Apply xuser policies (if present) after the service ++ policies so the xuser ones don't get overridden. --> ++ <include ignore_missing="yes">system-xuser.conf</include> ++ + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">system-local.conf</include> +-- +2.1.4 + -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
