From 17f12d8725aeb7bf72726346881fdbda6f885481 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 19 Feb 2015 15:52:17 +0000
Subject: [PATCH] Remove <apparmor/> from default system.conf, session.conf

The AppArmor and SELinux modes both default to "enabled" (i.e.
enable it if and only if it is supported), so there is no need to
add their element to system.conf unless a system integrator wants
to set them to either required or disabled.

However, if we add <apparmor/> on upgrade from 1.9.10 to 1.9.12,
any subsequent attempts to reload bus configuration before the
next reboot will fail, because the dbus-daemon that is already
running does not support that element.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89231
Reviewed-by: Tyler Hicks <tyhicks@canonical.com>
---
 bus/session.conf.in | 3 ---
 bus/system.conf.in  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/bus/session.conf.in b/bus/session.conf.in
index d2e3f2d05..cfe9544fb 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -25,9 +25,6 @@
     <allow own="*"/>
   </policy>
 
-  <!-- Enable AppArmor mediation when it is available -->
-  <apparmor mode="enabled"/>
-
   <!-- Config files are placed here that among other things, 
        further restrict the above policy for specific services. -->
   <includedir>session.d</includedir>
diff --git a/bus/system.conf.in b/bus/system.conf.in
index fc472bd76..ac78c734f 100644
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -97,9 +97,6 @@
            send_interface="org.freedesktop.DBus.Debug.Stats"/>
   </policy>
 
-  <!-- Enable AppArmor mediation when it is available -->
-  <apparmor mode="enabled"/>
-
   <!-- Config files are placed here that among other things, punch 
        holes in the above policy for specific services. -->
   <includedir>system.d</includedir>
-- 
2.47.3