]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Add apparmor element and attributes to the bus config dtd
authorTyler Hicks <tyhicks@canonical.com>
Tue, 11 Feb 2014 00:29:06 +0000 (18:29 -0600)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 18 Feb 2015 17:03:56 +0000 (17:03 +0000)
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>
doc/busconfig.dtd

index 0cc519b4d7b8ef66a095c6e5fec682a29600ad8e..8c5ac334cabeb71b20758735d046d7512396f038 100644 (file)
@@ -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">