dbus/doc busconfig.dtd,1.4,1.5

[Colin Walters]

Update of /cvs/dbus/dbus/doc
In directory gabe:/tmp/cvs-serv11428/doc

Modified Files:
	busconfig.dtd 
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.


Index: busconfig.dtd
===================================================================
RCS file: /cvs/dbus/dbus/doc/busconfig.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- busconfig.dtd	17 Sep 2004 09:14:49 -0000	1.4
+++ busconfig.dtd	18 Oct 2004 04:04:12 -0000	1.5
@@ -23,6 +23,7 @@
 <!ELEMENT include (#PCDATA)>
 <!ATTLIST include 
           ignore_missing (yes|no) "no"
+          if_selinux_enabled (yes|no) "no"
           selinux_root_relative (yes|no) "no">
 
 <!ELEMENT policy (allow|deny)*>