diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-19 15:52:17 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-19 16:46:21 +0000 |
| commit | 17f12d8725aeb7bf72726346881fdbda6f885481 (patch) | |
| tree | 9e4ea8b6805b8e07630cf3d41480aff6159fc670 | |
| parent | 65a84fd56d1f04b7c390aaf45384f188c74e6d8a (diff) | |
| download | dbus-17f12d8725aeb7bf72726346881fdbda6f885481.tar.gz | |
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>
| -rw-r--r-- | bus/session.conf.in | 3 | ||||
| -rw-r--r-- | bus/system.conf.in | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/bus/session.conf.in b/bus/session.conf.in index d2e3f2d0..cfe9544f 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 fc472bd7..ac78c734 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> |