From e8d396efef695b9868b0112c4a6266c97678fa8a Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 27 Apr 2003 06:25:42 +0000 Subject: 2003-04-27 Havoc Pennington 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 --- bus/connection.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'bus/connection.h') diff --git a/bus/connection.h b/bus/connection.h index ebfe2ad2..92c93267 100644 --- a/bus/connection.h +++ b/bus/connection.h @@ -56,11 +56,13 @@ void bus_connections_expire_incomplete (BusConnections dbus_bool_t bus_connection_is_active (DBusConnection *connection); +const char *bus_connection_get_name (DBusConnection *connection); dbus_bool_t bus_connection_preallocate_oom_error (DBusConnection *connection); void bus_connection_send_oom_error (DBusConnection *connection, DBusMessage *in_reply_to); + /* called by services.c */ dbus_bool_t bus_connection_add_owned_service (DBusConnection *connection, BusService *service); @@ -71,9 +73,9 @@ void bus_connection_add_owned_service_link (DBusConnection *connection, int bus_connection_get_n_services_owned (DBusConnection *connection); /* called by driver.c */ -dbus_bool_t bus_connection_set_name (DBusConnection *connection, - const DBusString *name); -const char *bus_connection_get_name (DBusConnection *connection); +dbus_bool_t bus_connection_complete (DBusConnection *connection, + const DBusString *name, + DBusError *error); /* called by dispatch.c when the connection is dropped */ void bus_connection_disconnected (DBusConnection *connection); @@ -82,9 +84,9 @@ dbus_bool_t bus_connection_is_in_group (DBusConnection *connection, unsigned long gid); dbus_bool_t bus_connection_get_groups (DBusConnection *connection, unsigned long **groups, - int *n_groups); -BusClientPolicy* bus_connection_get_policy (DBusConnection *connection, + int *n_groups, DBusError *error); +BusClientPolicy* bus_connection_get_policy (DBusConnection *connection); /* transaction API so we can send or not send a block of messages as a whole */ -- cgit