diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-21 12:29:36 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-21 12:29:36 +0200 |
| commit | 52b9b66b7d7045a0b0a25150dc8ee0c7b815e414 (patch) | |
| tree | 699d1bfe78dfb009624ba9e783e3b562609380fa /src/login/logind-core.c | |
| parent | 48062f072c7ba679667a309a76f71d595f0287e7 (diff) | |
| parent | 42fbdf45864b46f3eb62a3738b81e687685eb9bd (diff) | |
Merge pull request #3005 from keszybz/kill-user-proceses
Kill user session scope by default
Diffstat (limited to 'src/login/logind-core.c')
| -rw-r--r-- | src/login/logind-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 8bdb3a9a38..cbf8d757fe 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -364,16 +364,16 @@ bool manager_shall_kill(Manager *m, const char *user) { assert(m); assert(user); - if (!m->kill_user_processes) + if (!m->kill_exclude_users && streq(user, "root")) return false; if (strv_contains(m->kill_exclude_users, user)) return false; - if (strv_isempty(m->kill_only_users)) - return true; + if (!strv_isempty(m->kill_only_users)) + return strv_contains(m->kill_only_users, user); - return strv_contains(m->kill_only_users, user); + return m->kill_user_processes; } static int vt_is_busy(unsigned int vtnr) { |