fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-04-22 21:00:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore ActivationFailure if not using systemd activation

Browse source 
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: Simon McVittie <smcv@debian.org>
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98157
This commit is contained in:
Simon McVittie 2016-10-07 21:26:36 +01:00
parent 28fc54e352
commit a511e9e4b8
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bus/driver.c
View file

@ -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);
}