dbus/test/data/valid-config-files basic.conf,1.5,1.6

[Havoc Pennington]

Update of /cvs/dbus/dbus/test/data/valid-config-files
In directory pdx:/tmp/cvs-serv30925/test/data/valid-config-files

Modified Files:
	basic.conf 
Log Message:
2004-07-24  Havoc Pennington  <hp at redhat.com>

	SELinux support from Matthew Rickard <mjricka at epoch.ncsc.mil>

	* bus/selinux.c, bus/selinux.h: new file encapsulating selinux
	functionality

	* configure.in: add --enable-selinux
	
	* bus/policy.c (bus_policy_merge): add FIXME to a comment

	* bus/main.c (main): initialize and shut down selinux

	* bus/connection.c: store SELinux ID on each connection, to avoid 
	repeated getting of the string context and converting it into 
	an ID

	* bus/bus.c (bus_context_get_policy): new accessor, though it
	isn't used
	(bus_context_check_security_policy): check whether the security
	context of sender connection can send to the security context of
	recipient connection

	* bus/config-parser.c: add parsing for <selinux> and <associate>
	
	* dbus/dbus-transport.c (_dbus_transport_get_unix_fd): to
	implement dbus_connection_get_unix_fd()

	* dbus/dbus-connection.c (dbus_connection_get_unix_fd): new
	function, used by the selinux stuff
	


Index: basic.conf
===================================================================
RCS file: /cvs/dbus/dbus/test/data/valid-config-files/basic.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- basic.conf	25 Apr 2003 23:50:34 -0000	1.5
+++ basic.conf	30 Jul 2004 05:59:34 -0000	1.6
@@ -21,5 +21,12 @@
   <limit name="max_connections_per_user">64</limit>
   <limit name="max_pending_activations">64</limit>
   <limit name="max_services_per_connection">256</limit>
-                                   
+
+  <selinux>
+        <associate own="org.freedesktop.FrobationaryMeasures"
+         context="my_selinux_context_t"/>
+        <associate own="org.freedesktop.BlahBlahBlah"
+         context="foo_t"/>
+  </selinux>
+
 </busconfig>