X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-socket.c;h=c57cce19fbdfbcb51ab53b6ca600e2b114ad001e;hp=80d19dd1bd917b08fd66b4fae21a1fac98acceae;hb=6524990fdc98370ecba5d9f73e67161e8798c010;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8 diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c index 80d19dd1b..c57cce19f 100644 --- a/src/core/dbus-socket.c +++ b/src/core/dbus-socket.c @@ -24,7 +24,9 @@ #include "dbus-unit.h" #include "dbus-socket.h" #include "dbus-execute.h" +#include "dbus-kill.h" #include "dbus-common.h" +#include "selinux-access.h" #define BUS_SOCKET_INTERFACE \ " \n" \ @@ -36,6 +38,7 @@ BUS_EXEC_COMMAND_INTERFACE("ExecStopPre") \ BUS_EXEC_COMMAND_INTERFACE("ExecStopPost") \ BUS_EXEC_CONTEXT_INTERFACE \ + BUS_KILL_CONTEXT_INTERFACE \ " \n" \ " \n" \ " \n" \ @@ -132,8 +135,11 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes { "org.freedesktop.systemd1.Unit", bus_unit_properties, u }, { "org.freedesktop.systemd1.Socket", bus_socket_properties, s }, { "org.freedesktop.systemd1.Socket", bus_exec_context_properties, &s->exec_context }, + { "org.freedesktop.systemd1.Socket", bus_kill_context_properties, &s->kill_context }, { NULL, } }; + SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status"); + return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps); }