diff options
| author | Colin Walters <walters@verbum.org> | 2004-10-18 04:04:12 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2004-10-18 04:04:12 +0000 |
| commit | 736fa825e15c8d72eac85080e6cdf028c2f8df43 (patch) | |
| tree | 6775c8bd1b8170ff3312ec055d369fb7d66997ba /bus/selinux.c | |
| parent | ca293924a0320277919c881d36bccdae5b8a32e7 (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/selinux.c')
| -rw-r--r-- | bus/selinux.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bus/selinux.c b/bus/selinux.c index b5fb6371..0946caf9 100644 --- a/bus/selinux.c +++ b/bus/selinux.c @@ -191,6 +191,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. */ |