Commit 4f116d78 authored by Jan Alexander Steffens's avatar Jan Alexander Steffens Committed by Simon McVittie

bus_driver_handle_update_activation_environment: Error on system buses

The default policy already disallows calls on system buses. Since any
bus with a service helper cleans the environment anyway, there's no
point in allowing this to be called.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92857Reviewed-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent 32f966b9
......@@ -986,6 +986,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
{
dbus_bool_t retval;
BusActivation *activation;
BusContext *context;
DBusMessageIter iter;
DBusMessageIter dict_iter;
DBusMessageIter dict_entry_iter;
......@@ -1011,6 +1012,16 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
}
#endif
context = bus_connection_get_context (connection);
if (bus_context_get_servicehelper (context) != NULL)
{
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
"Cannot change activation environment "
"on a system bus.");
return FALSE;
}
activation = bus_connection_get_activation (connection);
dbus_message_iter_init (message, &iter);
......
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