2003-05-17 Havoc Pennington <hp@pobox.com>

	* bus/config-parser.c (merge_included): merge in policies from
	child configuration file.

	* bus/policy.c (bus_policy_merge): function to merge two policies
	together

1 files changed, 10 insertions, 0 deletions

diff --git a/doc/TODO b/doc/TODO
index 05bd25db..75ba7d86 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -56,8 +56,18 @@
    will only be right for one of them. Probably need to just write() the serial 
    number, rather than putting it in the DBusMessage, or something.
 
+ - perhaps the bus driver should have properties that reflect attributes
+   of the session, such as hostname, architecture, operating system, 
+   etc. Could be useful for code that wants to special-case behavior 
+   for a particular host or class of hosts, for example.
+
  - currently the security policy stuff for messages to/from 
    the bus driver is kind of strange; basically it's hardcoded that 
    you can always talk to the driver, but the default config file 
    has rules for it anyway, or something. it's conceptually 
    screwy at the moment.
+
+ - <limit> elements are not merged in from included configuration 
+   files; they have to be in the toplevel file. when loading 
+   a child file, we could just init its DBusLimits from the parent, 
+   then after parsing copy its DBusLimits back to the parent