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/pam-module.c | |
| parent | ac2dcbb2155fa421b826cfd45ec98d4237b1c9fe (diff) | |
logind: move default reset controller/kill exclude list into logind
Diffstat (limited to 'src/pam-module.c')
| -rw-r--r-- | src/pam-module.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/pam-module.c b/src/pam-module.c index e1ad8c9bfa..90da898ff8 100644 --- a/src/pam-module.c +++ b/src/pam-module.c @@ -50,8 +50,6 @@ static int parse_argv(pam_handle_t *handle, bool *debug) { unsigned i; - bool reset_controller_set = false; - bool kill_exclude_users_set = false; assert(argc >= 0); assert(argc == 0 || argv); @@ -107,8 +105,6 @@ static int parse_argv(pam_handle_t *handle, *reset_controllers = l; } - reset_controller_set = true; - } else if (startswith(argv[i], "kill-only-users=")) { if (kill_only_users) { @@ -137,8 +133,6 @@ static int parse_argv(pam_handle_t *handle, *kill_exclude_users = l; } - kill_exclude_users_set = true; - } else if (startswith(argv[i], "debug=")) { if ((k = parse_boolean(argv[i] + 6)) < 0) { pam_syslog(handle, LOG_ERR, "Failed to parse debug= argument."); @@ -159,34 +153,6 @@ static int parse_argv(pam_handle_t *handle, } } - if (!reset_controller_set && reset_controllers) { - char **l; - - if (!(l = strv_new("cpu", NULL))) { - pam_syslog(handle, LOG_ERR, "Out of memory"); - return -ENOMEM; - } - - *reset_controllers = l; - } - - if (controllers) - strv_remove(*controllers, SYSTEMD_CGROUP_CONTROLLER); - - if (reset_controllers) - strv_remove(*reset_controllers, SYSTEMD_CGROUP_CONTROLLER); - - if (!kill_exclude_users_set && kill_exclude_users) { - char **l; - - if (!(l = strv_new("root", NULL))) { - pam_syslog(handle, LOG_ERR, "Out of memory"); - return -ENOMEM; - } - - *kill_exclude_users = l; - } - return 0; } |