dbus/test/data/invalid-config-files badselinux-2.conf, NONE, 1.1 badselinux-1.conf, NONE, 1.1

Colin Walters walters at freedesktop.org
Sun Oct 17 21:04:14 PDT 2004


Update of /cvs/dbus/dbus/test/data/invalid-config-files
In directory gabe:/tmp/cvs-serv11428/test/data/invalid-config-files

Added Files:
	badselinux-2.conf badselinux-1.conf 
Log Message:
2004-10-18  Colin Walters  <walters at 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.


--- NEW FILE: badselinux-2.conf ---
<!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>

--- NEW FILE: badselinux-1.conf ---
<!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>



More information about the dbus-commit mailing list