dbus/bus driver.c, 1.52, 1.53 dbus-daemon-1.1.in, 1.8, 1.9 config-parser.c, 1.35, 1.36

[Olivier Andrieu]

Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv23709/bus

Modified Files:
	driver.c dbus-daemon-1.1.in config-parser.c 
Log Message:
* bus/config-parser.c (set_limit):
* bus/dbus-daemon-1.1.in:
* test/data/valid-config-files/many-rules.conf: set the
max_match_rules_per_connection limt from the config file. 

* doc/busconfig.dtd: update the DTD.

* bus/driver.c: remove some unused variables.


Index: driver.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/driver.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- driver.c	10 Aug 2004 03:06:59 -0000	1.52
+++ driver.c	25 Aug 2004 08:03:12 -0000	1.53
@@ -447,7 +447,7 @@
   DBusString service_name;
   char *name;
   int service_reply;
-  int flags;
+  dbus_uint32_t flags;
   dbus_bool_t retval;
   BusRegistry *registry;
 
@@ -842,7 +842,6 @@
   DBusConnection *conn;
   DBusMessage *reply;
   unsigned long uid;
-  const char *base_name;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
@@ -919,7 +918,6 @@
   DBusConnection *conn;
   DBusMessage *reply;
   unsigned long pid;
-  const char *base_name;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 

Index: dbus-daemon-1.1.in
===================================================================
RCS file: /cvs/dbus/dbus/bus/dbus-daemon-1.1.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dbus-daemon-1.1.in	30 Jul 2004 05:59:34 -0000	1.8
+++ dbus-daemon-1.1.in	25 Aug 2004 08:03:12 -0000	1.9
@@ -280,6 +280,8 @@
                                      progress at the same time
       "max_services_per_connection": max number of services a single 
                                      connection can own
+      "max_match_rules_per_connection": max number of match rules for a single 
+                                        connection
       "max_replies_per_connection" : max number of pending method 
                                      replies per connection
                                      (number of calls-in-progress)

Index: config-parser.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-parser.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- config-parser.c	23 Aug 2004 16:09:53 -0000	1.35
+++ config-parser.c	25 Aug 2004 08:03:12 -0000	1.36
@@ -1640,6 +1640,12 @@
       must_be_int = TRUE;
       parser->limits.max_services_per_connection = value;
     }
+  else if (strcmp (name, "max_match_rules_per_connection") == 0)
+    {
+      must_be_positive = TRUE;
+      must_be_int = TRUE;
+      parser->limits.max_match_rules_per_connection = value;
+    }
   else if (strcmp (name, "max_replies_per_connection") == 0)
     {
       must_be_positive = TRUE;