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 /test/data | |
| parent | ca293924a0320277919c881d36bccdae5b8a32e7 (diff) | |
| download | dbus-736fa825e15c8d72eac85080e6cdf028c2f8df43.tar.gz | |
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 'test/data')
| -rw-r--r-- | test/data/invalid-config-files/badselinux-1.conf | 10 | ||||
| -rw-r--r-- | test/data/invalid-config-files/badselinux-2.conf | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/test/data/invalid-config-files/badselinux-1.conf b/test/data/invalid-config-files/badselinux-1.conf new file mode 100644 index 00000000..4852ded2 --- /dev/null +++ b/test/data/invalid-config-files/badselinux-1.conf @@ -0,0 +1,10 @@ +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <user>mybususer</user> + <listen>unix:path=/foo/bar</listen> + <listen>tcp:port=1234</listen> + <includedir>basic.d</includedir> + <servicedir>/usr/share/foo</servicedir> + <include selinux_root_relative="jomoma">blah</include> +</busconfig> diff --git a/test/data/invalid-config-files/badselinux-2.conf b/test/data/invalid-config-files/badselinux-2.conf new file mode 100644 index 00000000..ac3b95c4 --- /dev/null +++ b/test/data/invalid-config-files/badselinux-2.conf @@ -0,0 +1,10 @@ +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <user>mybususer</user> + <listen>unix:path=/foo/bar</listen> + <listen>tcp:port=1234</listen> + <includedir>basic.d</includedir> + <servicedir>/usr/share/foo</servicedir> + <include if_selinux_enabled="moo">blah</include> +</busconfig> |