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

diff --git a/ChangeLog b/ChangeLog
index 3e3a0c198f002643e0cb06c47e8c80b91cb2eaa5..bce25c829dd2df0f7b8caba636961e7cf9c032a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-25  Olivier Andrieu  <oliv__a@users.sourceforge.net>
+
+       * 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.
+
 2004-08-24  Mikael Hallendal  <micke@imendio.com>
 
        * dbus/dbus-glib-lowlevel.h: Removed dbus_bus_get_with_g_main since 

diff --git a/bus/config-parser.c b/bus/config-parser.c
index f276fb525f3eb049ff3805ea69db6550d2d3b993..3b8c3ae46247c3ca861c21a98962f854e14df36c 100644 (file)
--- 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 893e24138b65913a907e7b6ebe9bdd90ab5042cf..52de9011c9671760bec1ff50afba8c21dd6ef6dc 100644 (file)
--- 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 5c4f4020ecf8a653949b2cd994f863da2afb8bbd..9923f121a7ed83562eaa8f87cbb498fd18cb6e33 100644 (file)
--- 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);
 

diff --git a/doc/busconfig.dtd b/doc/busconfig.dtd
index 5414bc5bc2d088a65c02d6b4e139a709670e9282..8833cf6262176d2ea4e6113ef89d5f9a0cbdb331 100644 (file)
--- a/doc/busconfig.dtd
+++ b/doc/busconfig.dtd
@@ -22,7 +22,8 @@
 
 <!ELEMENT include (#PCDATA)>
 <!ATTLIST include 
-          ignore_missing (yes|no) "yes">
+          ignore_missing (yes|no) "no"
+          selinux_root_relative (yes|no) "no">
 
 <!ELEMENT policy (allow|deny)*>
 <!ATTLIST policy 

diff --git a/test/data/valid-config-files/many-rules.conf b/test/data/valid-config-files/many-rules.conf
index f68430e5660f0cd8995abb4c4ec003db916cd30d..0c6758285776337609ff1a41fd35e7e2f4f47f58 100644 (file)
--- a/test/data/valid-config-files/many-rules.conf
+++ b/test/data/valid-config-files/many-rules.conf
@@ -53,5 +53,6 @@
   <limit name="max_connections_per_user">64</limit>
   <limit name="max_pending_activations">64</limit>
   <limit name="max_services_per_connection">256</limit>
+  <limit name="max_match_rules_per_connection">512</limit>
                                    
 </busconfig>