diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-07-13 19:58:35 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-07-13 19:59:28 +0200 |
| commit | de07ab16c6b919cead26c9a5209a362127ff6142 (patch) | |
| tree | 9b4d4f674ae5fa607fb8516be541d16dcca9e9c8 /src/logind-session-dbus.c | |
| parent | a17204af0e950be7a5199db62ef400814e29aa3c (diff) | |
loginctl: implement missing kill verb
Diffstat (limited to 'src/logind-session-dbus.c')
| -rw-r--r-- | src/logind-session-dbus.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/logind-session-dbus.c b/src/logind-session-dbus.c index 5fe391cca4..dc0ef5b3d6 100644 --- a/src/logind-session-dbus.c +++ b/src/logind-session-dbus.c @@ -36,6 +36,10 @@ " <method name=\"SetIdleHint\">\n" \ " <arg name=\"b\" type=\"b\"/>\n" \ " </method>\n" \ + " <method name=\"Kill\">\n" \ + " <arg name=\"who\" type=\"s\"/>\n" \ + " <arg name=\"signal\" type=\"s\"/>\n" \ + " </method>\n" \ " <property name=\"Id\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"User\" type=\"(uo)\" access=\"read\"/>\n" \ " <property name=\"Name\" type=\"s\" access=\"read\"/>\n" \ @@ -315,6 +319,38 @@ static DBusHandlerResult session_message_dispatch( if (!reply) goto oom; + } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Session", "Kill")) { + const char *swho; + int32_t signo; + KillWho who; + + if (!dbus_message_get_args( + message, + &error, + DBUS_TYPE_STRING, &swho, + DBUS_TYPE_INT32, &signo, + DBUS_TYPE_INVALID)) + return bus_send_error_reply(connection, message, &error, -EINVAL); + + if (isempty(swho)) + who = KILL_ALL; + else { + who = kill_who_from_string(swho); + if (who < 0) + return bus_send_error_reply(connection, message, &error, -EINVAL); + } + + if (signo <= 0 || signo >= _NSIG) + return bus_send_error_reply(connection, message, &error, -EINVAL); + + r = session_kill(s, who, signo); + if (r < 0) + return bus_send_error_reply(connection, message, NULL, r); + + reply = dbus_message_new_method_return(message); + if (!reply) + goto oom; + } else return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties); |