summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-14 21:59:25 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-14 23:48:20 +0100
commit824a1d590a0ec4d83baa51264a9913a702793230 (patch)
tree5b5248a8becd3f0b55ace097ebc7a76dc4c18b7a
parent57339f47f17b0268f2d05b5e8adde1b1d842fa48 (diff)
pam: rename 'no-session' to 'user' cgroup
-rw-r--r--man/pam_systemd.xml6
-rw-r--r--src/pam-module.c18
2 files changed, 12 insertions, 12 deletions
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index bfcc684521..3dc3714734 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -92,7 +92,7 @@
<listitem><para>If
<option>create-session=0</option> is set, a new
control group
- <filename>/user/$USER/no-session</filename>
+ <filename>/user/$USER/user</filename>
is created and the login process moved into
it.</para></listitem>
@@ -115,7 +115,7 @@
remaining processes in the
<filename>/user/$USER/$XDG_SESSION_ID</filename>
control group are migrated to
- <filename>/user/$USER/no-session</filename> and
+ <filename>/user/$USER/user</filename> and
the original control group is
removed.</para></listitem>
@@ -123,7 +123,7 @@
<option>kill-user=1</option> is specified, and
no other user session control group remains,
except
- <filename>/user/$USER/no-session</filename>,
+ <filename>/user/$USER/user</filename>,
all remaining processes in the
<filename>/user/$USER</filename> hierarchy
are killed and the control group is removed.</para></listitem>
diff --git a/src/pam-module.c b/src/pam-module.c
index 387b77ed56..5f2df4b439 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/no-session", username);
+ r = asprintf(&buf, "/user/%s/user", 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, "no-session");
+ remains = !streq(subgroup, "user");
free(subgroup);
if (remains)
@@ -416,7 +416,7 @@ _public_ PAM_EXTERN int pam_sm_close_session(
goto finish;
}
- /* We are probably still in some session/no-session dir. Move ourselves out of the way as first step */
+ /* We are probably still in some session/user dir. Move ourselves out of the way as first step */
if ((r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, "/user", 0)) < 0)
pam_syslog(handle, LOG_ERR, "Failed to move us away: %s", strerror(-r));
@@ -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/no-session", username) < 0) {
+ asprintf(&nosession_path, "/user/%s/user", username) < 0) {
r = PAM_BUF_ERR;
goto finish;
}
@@ -444,10 +444,10 @@ _public_ PAM_EXTERN int pam_sm_close_session(
} else {
pam_syslog(handle, LOG_INFO, "Moving remaining processes of user session %s of %s into control group %s.", id, username, nosession_path);
- /* Migrate processes from session to
- * no-session cgroup. First, try to create the
- * no-session group in case it doesn't exist
- * yet. Also, delete the session group. */
+ /* Migrate processes from session to user
+ * cgroup. First, try to create the user group
+ * in case it doesn't exist yet. Also, delete
+ * the session group. */
create_user_group(handle, nosession_path, pw, false, false);
if ((r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, session_path, nosession_path, false, true)) < 0)
@@ -464,7 +464,7 @@ _public_ PAM_EXTERN int pam_sm_close_session(
/* Kill user processes not attached to any session */
if (kill_user && r == 0) {
- /* Kill no-session cgroup */
+ /* Kill user cgroup */
if ((r = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, user_path, true)) < 0)
pam_syslog(handle, LOG_ERR, "Failed to kill user cgroup: %s", strerror(-r));
} else {