diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-08-13 17:59:28 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-08-13 17:59:28 +0200 |
| commit | 405e0255d5e6950180d9563f1a26294b5360db03 (patch) | |
| tree | 99bd33e34bee035602bfce76a8537d227414cf7f /src/core | |
| parent | ee530d8b73246f29781bd54a707ca75c7ef5a6cb (diff) | |
logind: restore logic to kill user processes when session ends
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/dbus-kill.c | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c index 80e15e3fca..811adb1b5a 100644 --- a/src/core/dbus-kill.c +++ b/src/core/dbus-kill.c @@ -48,7 +48,28 @@ int bus_kill_context_set_transient_property( assert(name); assert(i); - if (streq(name, "SendSIGHUP")) { + if (streq(name, "KillMode")) { + const char *m; + KillMode k; + + if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(i, &m); + + k = kill_mode_from_string(m); + if (k < 0) + return -EINVAL; + + if (mode != UNIT_CHECK) { + c->kill_mode = k; + + unit_write_drop_in_private_format(u, mode, name, "KillMode=%s\n", kill_mode_to_string(k)); + } + + return 1; + + } else if (streq(name, "SendSIGHUP")) { if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN) return -EINVAL; @@ -59,7 +80,7 @@ int bus_kill_context_set_transient_property( dbus_message_iter_get_basic(i, &b); c->send_sighup = b; - unit_write_drop_in_format(u, mode, name, "[Scope]\nSendSIGHUP=%s\n", yes_no(b)); + unit_write_drop_in_private_format(u, mode, name, "SendSIGHUP=%s\n", yes_no(b)); } return 1; @@ -75,7 +96,7 @@ int bus_kill_context_set_transient_property( dbus_message_iter_get_basic(i, &b); c->send_sigkill = b; - unit_write_drop_in_format(u, mode, name, "[Scope]\nSendSIGKILL4=%s\n", yes_no(b)); + unit_write_drop_in_private_format(u, mode, name, "SendSIGKILL=%s\n", yes_no(b)); } return 1; |