chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b37284
)
Prep v238: Disallow killing of lingering user processes even if forced.
author
Sven Eden
<yamakuzure@gmx.net>
Mon, 18 Jun 2018 07:23:46 +0000
(09:23 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 29 Jun 2018 05:12:51 +0000
(07:12 +0200)
src/login/logind-session.c
patch
|
blob
|
history
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index 6d2b755ebfdb561e63e268ef72163dc9b744158f..79669b2a8fb7730adf50ed628921eaff458ee3f2 100644
(file)
--- 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);