diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-27 06:25:42 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-27 06:25:42 +0000 |
| commit | e8d396efef695b9868b0112c4a6266c97678fa8a (patch) | |
| tree | e6702685d70c2dd65c6b301de8904a672ef7b419 /bus/config-parser.c | |
| parent | b3bd48edfc1aab0a9dc64bfa4c380d845d218e73 (diff) | |
2003-04-27 Havoc Pennington <hp@pobox.com>
Unbreak my code...
* dbus/dbus-transport.c (_dbus_transport_get_dispatch_status):
report correct status if we finish processing authentication
inside this function.
* bus/activation.c (try_send_activation_failure): use
bus_transaction_send_error_reply
* bus/connection.c (bus_connection_get_groups): return an error
explaining the problem
* bus/bus.c (bus_context_check_security_policy): implement
restriction here that inactive connections can only send the
hello message. Also, allow bus driver to send anything to
any recipient.
* bus/connection.c (bus_connection_complete): create the
BusClientPolicy here instead of on-demand.
(bus_connection_get_policy): don't return an error
* dbus/dbus-message.c (dbus_message_new_error_reply): allow NULL
sender field in message being replied to
* bus/bus.c (bus_context_check_security_policy): fix silly typo
causing it to return FALSE always
* bus/policy.c (bus_client_policy_check_can_send): fix bug where
we checked sender rather than destination
Diffstat (limited to 'bus/config-parser.c')
| -rw-r--r-- | bus/config-parser.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index 5e279639..90f9efd3 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -295,17 +295,17 @@ bus_config_parser_new (const DBusString *basedir) parser->limits.max_incoming_bytes = _DBUS_ONE_MEGABYTE * 63; parser->limits.max_outgoing_bytes = _DBUS_ONE_MEGABYTE * 63; parser->limits.max_message_size = _DBUS_ONE_MEGABYTE * 32; - -#ifdef DBUS_BUILD_TESTS - parser->limits.activation_timeout = 6000; /* 6 seconds */ -#else - parser->limits.activation_timeout = 15000; /* 15 seconds */ -#endif + + /* Making this long means the user has to wait longer for an error + * message if something screws up, but making it too short means + * they might see a false failure. + */ + parser->limits.activation_timeout = 25000; /* 25 seconds */ /* Making this long risks making a DOS attack easier, but too short * and legitimate auth will fail. If interactive auth (ask user for * password) is allowed, then potentially it has to be quite long. - */ + */ parser->limits.auth_timeout = 30000; /* 30 seconds */ parser->limits.max_incomplete_connections = 32; |