From: Sven Eden <yamakuzure@gmx.net>
Date: Mon, 18 Jun 2018 07:23:46 +0000 (+0200)
Subject: Prep v238: Disallow killing of lingering user processes even if forced.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9e89768d6cfef494067b82871b4d9b1d2bac2d8e;p=elogind.git

Prep v238: Disallow killing of lingering user processes even if forced.
---

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 6d2b755eb..79669b2a8 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -735,9 +735,8 @@ static int session_stop_cgroup(Session *s, bool force) {
 #if 0 /// elogind must not kill lingering user processes alive
         if (force || manager_shall_kill(s->manager, s->user->name)) {
 #else
-        if (force
-          || ( manager_shall_kill(s->manager, s->user->name)
-            && (user_check_linger_file(s->user) < 1) ) ) {
+        if ( (force || manager_shall_kill(s->manager, s->user->name) )
+            && (user_check_linger_file(s->user) < 1) ) {
 #endif // 1
 
                 r = session_kill(s, KILL_ALL, SIGTERM);