* 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.

3 files changed, 9 insertions, 3 deletions

diff --git a/bus/config-parser.c b/bus/config-parser.c
index f276fb52..3b8c3ae4 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -1640,6 +1640,12 @@ set_limit (BusConfigParser *parser,
       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;
diff --git a/bus/dbus-daemon-1.1.in b/bus/dbus-daemon-1.1.in
index 893e2413..52de9011 100644
--- a/bus/dbus-daemon-1.1.in
+++ b/bus/dbus-daemon-1.1.in
@@ -280,6 +280,8 @@ Available limit names are:
                                      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)
diff --git a/bus/driver.c b/bus/driver.c
index 5c4f4020..9923f121 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -447,7 +447,7 @@ bus_driver_handle_acquire_service (DBusConnection *connection,
   DBusString service_name;
   char *name;
   int service_reply;
-  int flags;
+  dbus_uint32_t flags;
   dbus_bool_t retval;
   BusRegistry *registry;
 
@@ -842,7 +842,6 @@ bus_driver_handle_get_connection_unix_user (DBusConnection *connection,
   DBusConnection *conn;
   DBusMessage *reply;
   unsigned long uid;
-  const char *base_name;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
@@ -919,7 +918,6 @@ bus_driver_handle_get_connection_unix_process_id (DBusConnection *connection,
   DBusConnection *conn;
   DBusMessage *reply;
   unsigned long pid;
-  const char *base_name;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);