picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logind: add new session type "web" for PAM web clients, such as cockpit 

On request of Stef Walter.
This commit is contained in:
Lennart Poettering 2014-08-14 02:59:02 +02:00
parent 8085f163c5
commit e9e74f28d7
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/login/logind-session.c
View File

@ -1159,6 +1159,7 @@ static const char* const session_type_table[_SESSION_TYPE_MAX] = {
[SESSION_X11] = "x11",
[SESSION_WAYLAND] = "wayland",
[SESSION_MIR] = "mir",
[SESSION_WEB] = "web",
};
DEFINE_STRING_TABLE_LOOKUP(session_type, SessionType);

1
src/login/logind-session.h
View File

@ -56,6 +56,7 @@ typedef enum SessionType {
SESSION_X11,
SESSION_WAYLAND,
SESSION_MIR,
SESSION_WEB,
_SESSION_TYPE_MAX,
_SESSION_TYPE_INVALID = -1
} SessionType;

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

@ -714,7 +714,7 @@ int user_kill(User *u, int signo) {
}
void user_elect_display(User *u) {
Session *graphical = NULL, *text = NULL, *s;
Session *graphical = NULL, *text = NULL, *other = NULL, *s;
assert(u);
@ -732,22 +732,35 @@ void user_elect_display(User *u) {
if (SESSION_TYPE_IS_GRAPHICAL(s->type))
graphical = s;
else
else if (s->type == SESSION_TTY)
text = s;
else
other = s;
}
if (graphical &&
(!u->display ||
u->display->class != SESSION_USER ||
u->display->stopping ||
!SESSION_TYPE_IS_GRAPHICAL(u->display->type)))
!SESSION_TYPE_IS_GRAPHICAL(u->display->type))) {
u->display = graphical;
return;
}
if (text &&
(!u->display ||
u->display->class != SESSION_USER ||
u->display->stopping))
u->display->stopping ||
u->display->type != SESSION_TTY)) {
u->display = text;
return;
}
if (other &&
(!u->display ||
u->display->class != SESSION_USER ||
u->display->stopping))
u->display = other;
}
static const char* const user_state_table[_USER_STATE_MAX] = {