diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-14 02:29:21 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-14 02:29:21 +0000 |
| commit | 777707ed8dff6958972a93894a87ec1945c65c14 (patch) | |
| tree | 4ade9d56eccc5280150968e692a389e8749ed029 /bus/activation.c | |
| parent | 8aabca8dd28a113712389be51e75ea8c2fd17838 (diff) | |
2003-04-13 Havoc Pennington <hp@pobox.com>
* dbus/dbus-mainloop.c: fix some reentrancy issues by refcounting
callbacks
* test/data/valid-config-files/debug-allow-all.conf.in: allow all
users
* dbus/dbus-transport.c (_dbus_transport_get_dispatch_status):
fix to only recover unused bytes if we're already authenticated
(_dbus_transport_get_is_authenticated): fix to still mark us
authenticated if there are unused bytes.
* bus/dispatch.c: implement security policy checking
* bus/connection.c (bus_transaction_send_from_driver): new
* bus/bus.c (bus_context_check_security_policy): new
* bus/dispatch.c (send_service_nonexistent_error): delete this,
now we just set the DBusError and it gets converted to an error
reply.
* bus/connection.c (allow_user_function): enable code using actual
data from the config file
* bus/policy.c (list_allows_user): handle wildcard rules for
user/group connection perms
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/bus/activation.c b/bus/activation.c index 1a448a79..0a70d6b1 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -582,8 +582,7 @@ bus_activation_service_created (BusActivation *activation, goto error; } - if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS) || - !dbus_message_append_args (message, + if (!dbus_message_append_args (message, DBUS_TYPE_UINT32, DBUS_ACTIVATION_REPLY_ACTIVATED, 0)) { @@ -592,7 +591,7 @@ bus_activation_service_created (BusActivation *activation, goto error; } - if (!bus_transaction_send_message (transaction, entry->connection, message)) + if (!bus_transaction_send_from_driver (transaction, entry->connection, message)) { dbus_message_unref (message); BUS_SET_OOM (error); @@ -654,14 +653,8 @@ try_send_activation_failure (BusPendingActivation *pending_activation, how->message); if (!message) goto error; - - if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS)) - { - dbus_message_unref (message); - goto error; - } - if (!bus_transaction_send_message (transaction, entry->connection, message)) + if (!bus_transaction_send_from_driver (transaction, entry->connection, message)) { dbus_message_unref (message); goto error; @@ -861,8 +854,7 @@ bus_activation_activate_service (BusActivation *activation, return FALSE; } - if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS) || - !dbus_message_append_args (message, + if (!dbus_message_append_args (message, DBUS_TYPE_UINT32, DBUS_ACTIVATION_REPLY_ALREADY_ACTIVE, 0)) { @@ -872,7 +864,7 @@ bus_activation_activate_service (BusActivation *activation, return FALSE; } - retval = bus_transaction_send_message (transaction, connection, message); + retval = bus_transaction_send_from_driver (transaction, connection, message); dbus_message_unref (message); if (!retval) { |