diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | bus/config-parser.c | 6 | ||||
| -rw-r--r-- | bus/dbus-daemon-1.1.in | 2 | ||||
| -rw-r--r-- | bus/driver.c | 4 | ||||
| -rw-r--r-- | doc/busconfig.dtd | 3 | ||||
| -rw-r--r-- | test/data/valid-config-files/many-rules.conf | 1 |
6 files changed, 23 insertions, 4 deletions
@@ -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 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); diff --git a/doc/busconfig.dtd b/doc/busconfig.dtd index 5414bc5b..8833cf62 100644 --- 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 f68430e5..0c675828 100644 --- 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> |