Commit a511e9e4 authored by Simon McVittie's avatar Simon McVittie

Ignore ActivationFailure if not using systemd activation

This isn't security-related, just defensive programming: if
dbus-daemon wasn't run with --systemd-activation, then there is no
reason why systemd would legitimately send us this signal, and if it
does we should just ignore it.
Signed-off-by: default avatarSimon McVittie <smcv@debian.org>
Reviewed-by: Colin Walters's avatarColin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98157
parent 28fc54e3
......@@ -2643,6 +2643,14 @@ bus_driver_handle_message (DBusConnection *connection,
return TRUE;
}
if (!bus_context_get_systemd_activation (context))
{
bus_context_log (context, DBUS_SYSTEM_LOG_WARNING,
"Ignoring unexpected ActivationFailure message "
"while not using systemd activation");
return FALSE;
}
return dbus_activation_systemd_failure(bus_context_get_activation(context), message);
}
......
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