shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

logind-user: take gc_mode into account when reporting user state

Browse Source 
Prompted by #33650

Previously, if a user manually starts user@.service (which is
something we support), we'd track it as 'manager' session.
However, since user_get_state() ignores all non-pinning sessions,
if lingering is not enabled, the user state would always be
reported as 'closing', which is spurious.

Let's instead take gc_mode into consideration, and ignore
non-pinning sessions only if USER_GC_BY_PIN.

(cherry picked from commit 56f4ab290643547853276fb72b4e6960586c3e7c)
This commit is contained in:
Mike Yuan 2024-07-06 19:05:57 +02:00 committed by Luca Boccassi
parent bcb13a3fa2
commit 5d6bf58cf2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/login/logind-user.c
View File

@ -821,30 +821,30 @@ UserState user_get_state(User *u) {
if (!u->started || u->runtime_dir_job)
return USER_OPENING;
bool any = false, all_closing = true;
LIST_FOREACH(sessions_by_user, i, u->sessions) {
SessionState state;
/* USER_GC_BY_PIN: Only pinning sessions count. None -> closing
* USER_GC_BY_ANY: 'manager' sessions also count. However, if lingering is enabled, 'lingering' state
* shall be preferred. 'online' if the manager is manually started by user. */
/* Ignore sessions that don't pin the user, i.e. are not supposed to have an effect on user state */
if (!SESSION_CLASS_PIN_USER(i->class))
bool has_pinning = false, all_closing = true;
LIST_FOREACH(sessions_by_user, i, u->sessions) {
bool pinned = SESSION_CLASS_PIN_USER(i->class);
if (u->gc_mode == USER_GC_BY_PIN && !pinned)
continue;
state = session_get_state(i);
if (state == SESSION_ACTIVE)
has_pinning = has_pinning || pinned;
SessionState state = session_get_state(i);
if (state == SESSION_ACTIVE && pinned)
return USER_ACTIVE;
if (state != SESSION_CLOSING)
all_closing = false;
any = true;
}
if (any)
return all_closing ? USER_CLOSING : USER_ONLINE;
if (user_check_linger_file(u) > 0 && user_unit_active(u))
if (!has_pinning && user_check_linger_file(u) > 0 && user_unit_active(u))
return USER_LINGERING;
return USER_CLOSING;
return all_closing ? USER_CLOSING : USER_ONLINE;
}
int user_kill(User *u, int signo) {