From 96a8cbfae1b37cf0a9c0591bfef93f9de1561bc4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Nov 2010 23:22:05 +0100 Subject: [PATCH] pam: rename master user cgroup to 'master' --- src/pam-module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pam-module.c b/src/pam-module.c index 5f2df4b43..d9458df98 100644 --- a/src/pam-module.c +++ b/src/pam-module.c @@ -335,7 +335,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( r = asprintf(&buf, "/user/%s/%s", username, id); } else - r = asprintf(&buf, "/user/%s/user", username); + r = asprintf(&buf, "/user/%s/master", username); if (r < 0) { r = PAM_BUF_ERR; @@ -369,7 +369,7 @@ static int session_remains(pam_handle_t *handle, const char *user_path) { while ((r = cg_read_subgroup(d, &subgroup)) > 0) { - remains = !streq(subgroup, "user"); + remains = !streq(subgroup, "master"); free(subgroup); if (remains) @@ -430,7 +430,7 @@ _public_ PAM_EXTERN int pam_sm_close_session( if ((id = pam_getenv(handle, "XDG_SESSION_ID")) && created) { if (asprintf(&session_path, "/user/%s/%s", username, id) < 0 || - asprintf(&nosession_path, "/user/%s/user", username) < 0) { + asprintf(&nosession_path, "/user/%s/master", username) < 0) { r = PAM_BUF_ERR; goto finish; } -- 2.30.2