From: Tyler Hicks <tyhicks@canonical.com>
Date: Tue, 11 Feb 2014 00:29:06 +0000 (-0600)
Subject: Add apparmor element and attributes to the bus config dtd
X-Git-Tag: dbus-1.9.12~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6b90976c851f64f0a6c99e2b34b784fd2972a94;p=thirdparty%2Fdbus.git

Add apparmor element and attributes to the bus config dtd

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75113
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/doc/busconfig.dtd b/doc/busconfig.dtd
index 0cc519b4d..8c5ac334c 100644
--- a/doc/busconfig.dtd
+++ b/doc/busconfig.dtd
@@ -11,7 +11,8 @@
                      include |
                      policy |
                      limit |
-                     selinux)*>
+                     selinux |
+                     apparmor)*>
 
 <!ELEMENT user (#PCDATA)>
 <!ELEMENT listen (#PCDATA)>
@@ -63,3 +64,7 @@
 <!ATTLIST associate
           own CDATA #REQUIRED
           context CDATA #REQUIRED>
+
+<!ELEMENT apparmor EMPTY>
+<!ATTLIST apparmor
+          mode (required|enabled|disabled) "enabled">