summaryrefslogtreecommitdiffstats
path: root/bus/session.conf.in
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2004-10-18 04:04:12 +0000
committerColin Walters <walters@verbum.org>2004-10-18 04:04:12 +0000
commit736fa825e15c8d72eac85080e6cdf028c2f8df43 (patch)
tree6775c8bd1b8170ff3312ec055d369fb7d66997ba /bus/session.conf.in
parentca293924a0320277919c881d36bccdae5b8a32e7 (diff)
2004-10-18 Colin Walters <walters@verbum.org>
* bus/selinux.h: Add bus_selinux_enabled. * bus/selinux.c (bus_selinux_enabled): Implement it. * bus/config-parser.c (struct include): Add if_selinux_enabled member. (start_busconfig_child): Parse if_selinux_enabled attribute for include. (bus_config_parser_content): Handle it. * bus/session.conf.in, bus/system.conf.in: Add inclusion of context mapping to default config files; conditional on SELinux being enabled. * doc/busconfig.dtd: Add to if_selinux_enabled to default DTD. * test/data/invalid-config-files/badselinux-1.conf, test/data/invalid-config-files/badselinux-2.conf: Test files for bad syntax.
Diffstat (limited to 'bus/session.conf.in')
-rw-r--r--bus/session.conf.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/bus/session.conf.in b/bus/session.conf.in
index 34d2492c..a537d9dc 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -26,4 +26,7 @@
<!-- This is included last so local configuration can override what's
in this standard file -->
<include ignore_missing="yes">session-local.conf</include>
+
+ <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+
</busconfig>