logind: honour killProcesses field of user record

2020-01-15 15:29:24 +01:00
parent e8e4b7a0b6
commit 156a363750
1 changed files with 4 additions and 1 deletions
@@ -750,7 +750,10 @@ static int session_stop_scope(Session *s, bool force) {
        s->scope_job = mfree(s->scope_job);

        /* Optionally, let's kill everything that's left now. */
-        if (force || manager_shall_kill(s->manager, s->user->user_record->user_name)) {
+        if (force ||
+            (s->user->user_record->kill_processes != 0 &&
+             (s->user->user_record->kill_processes > 0 ||
+              manager_shall_kill(s->manager, s->user->user_record->user_name)))) {

                r = manager_stop_unit(s->manager, s->scope, &error, &s->scope_job);
                if (r < 0) {