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:
c3493a4
)
logind: reload config on SIGHUP
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 9 Apr 2016 19:03:19 +0000
(15:03 -0400)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 16 Jun 2017 08:12:57 +0000
(10:12 +0200)
v2:
- fix setting of kill_user_processes and
*_ignore_inhibited settings
src/login/logind-core.c
patch
|
blob
|
history
diff --git
a/src/login/logind-core.c
b/src/login/logind-core.c
index 3079d45b94e4ea8d5c873e80abe8af02965c8105..5e62e5ecdb69f3a127bb55898b863f3468677dc1 100644
(file)
--- a/
src/login/logind-core.c
+++ b/
src/login/logind-core.c
@@
-395,6
+395,9
@@
bool manager_shall_kill(Manager *m, const char *user) {
if (!m->kill_user_processes)
return false;
if (!m->kill_user_processes)
return false;
+ if (!m->kill_exclude_users && streq(user, "root"))
+ return false;
+
if (strv_contains(m->kill_exclude_users, user))
return false;
if (strv_contains(m->kill_exclude_users, user))
return false;