Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'jb49519' into 'master'
[systemd] Fix sd_seat_get_sessions. Contributes to JB#49519 See merge request mer-core/systemd!31
- Loading branch information
Showing
2 changed files
with
41 additions
and
0 deletions.
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
rpm/systemd-234-sd-login-read-list-of-uids-of-sessions-from-UIDS-not.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From 90b7c52d8320d32db5e42eedddd30558a9d69a63 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> | ||
Date: Thu, 18 May 2017 20:58:23 -0400 | ||
Subject: [PATCH] sd-login: read list of uids of sessions from UIDS not | ||
ACTIVE_SESSIONS | ||
|
||
As described by Luke Shumaker: | ||
|
||
sd_seat_get_sessions looks at /run/systemd/seats/${seat_name}:SESSIONS to get | ||
the list of sessions (which I believe is correct), and at | ||
/run/systemd/seats/${seat_name}:ACTIVE_SESSIONS for the list of users (which | ||
I believe is incorrect); I believe that it should look at the UIDS field for | ||
the list of users. As far as I can tell, the ACTIVE_SESSIONS field is never | ||
even present in the seats file. I also believe that this has been broken | ||
since the function was first committed almost 6 years ago. | ||
|
||
Fixes #5743. | ||
--- | ||
src/libsystemd/sd-login/sd-login.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c | ||
index 0eadc8c74..69fb5f19b 100644 | ||
--- a/src/libsystemd/sd-login/sd-login.c | ||
+++ b/src/libsystemd/sd-login/sd-login.c | ||
@@ -616,7 +616,7 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui | ||
|
||
r = parse_env_file(p, NEWLINE, | ||
"SESSIONS", &s, | ||
- "ACTIVE_SESSIONS", &t, | ||
+ "UIDS", &t, | ||
NULL); | ||
|
||
if (r < 0) | ||
-- | ||
2.25.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters