From 736fa825e15c8d72eac85080e6cdf028c2f8df43 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 18 Oct 2004 04:04:12 +0000 Subject: 2004-10-18 Colin Walters * 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. --- bus/selinux.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'bus/selinux.c') diff --git a/bus/selinux.c b/bus/selinux.c index b5fb6371..0946caf9 100644 --- a/bus/selinux.c +++ b/bus/selinux.c @@ -190,6 +190,16 @@ avc_free_lock (void *lock) } #endif /* HAVE_SELINUX */ +/** + * Return whether or not SELinux is enabled; must be + * called after bus_selinux_init. + */ +dbus_bool_t +bus_selinux_enabled (void) +{ + return selinux_enabled; +} + /** * Initialize the user space access vector cache (AVC) for D-BUS and set up * logging callbacks. -- cgit