Commit 8a2c91b8 authored by Olivier Andrieu's avatar Olivier Andrieu

* 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.
parent 83c224e3
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
......
......@@ -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;
......
......@@ -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)
......
......@@ -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);
......
......@@ -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
......
......@@ -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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment