diff options
author | Lennart Poettering <lennart@poettering.net> | 2011-06-29 02:27:16 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2011-06-29 02:27:16 +0200 |
commit | 25d934917d3dd2ab10e8acc9a6bacd8c7f2f1067 (patch) | |
tree | fdcb8edf4cd8f3513fe0506814d140c5d5950613 /src/logind.c | |
parent | ac2dcbb2155fa421b826cfd45ec98d4237b1c9fe (diff) | |
download | systemd-25d934917d3dd2ab10e8acc9a6bacd8c7f2f1067.tar.gz |
logind: move default reset controller/kill exclude list into logind
Diffstat (limited to 'src/logind.c')
-rw-r--r-- | src/logind.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/logind.c b/src/logind.c index 94cb6cd80c..28ba58bf54 100644 --- a/src/logind.c +++ b/src/logind.c @@ -56,7 +56,14 @@ Manager *manager_new(void) { m->cgroups = hashmap_new(string_hash_func, string_compare_func); m->fifo_fds = hashmap_new(trivial_hash_func, trivial_compare_func); - if (!m->devices || !m->seats || !m->sessions || !m->users) { + if (!m->devices || !m->seats || !m->sessions || !m->users || !m->cgroups || !m->fifo_fds) { + manager_free(m); + return NULL; + } + + m->reset_controllers = strv_new("cpu", NULL); + m->kill_exclude_users = strv_new("root", NULL); + if (!m->reset_controllers || !m->kill_exclude_users) { manager_free(m); return NULL; } |