shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-15 07:24:00 +03:00
Code

login: set pos-slot to fallback on pos-eviction

Browse Source 
If we evict a session position, we open the position slot for future
sessions. However, there might already be another session on the same
position if both were started on the same VT. This is currently done if
gdm spawns the session on its own Xserver.

Hence, look for such a session on pos-eviction and claim the new slot
immediately.
This commit is contained in:
David Herrmann 2014-02-25 13:08:24 +01:00
parent 949138ccc3
commit 3e6b205f81
Notes: Lennart Poettering 2014-02-25 15:16:14 +01:00 
Backport: bugfix
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/login/logind-seat.c
View File

@ -459,6 +459,7 @@ int seat_stop_sessions(Seat *s, bool force) {
}
void seat_evict_position(Seat *s, Session *session) {
Session *iter;
unsigned int pos = session->pos;
session->pos = 0;
@ -466,8 +467,19 @@ void seat_evict_position(Seat *s, Session *session) {
if (!pos)
return;
if (pos < s->position_count && s->positions[pos] == session)
if (pos < s->position_count && s->positions[pos] == session) {
s->positions[pos] = NULL;
/* There might be another session claiming the same
* position (eg., during gdm->session transition), so lets look
* for it and set it on the free slot. */
LIST_FOREACH(sessions_by_seat, iter, s->sessions) {
if (iter->pos == pos) {
s->positions[pos] = iter;
break;
}
}
}
}
void seat_claim_position(Seat *s, Session *session, unsigned int pos) {