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

[elogind.git] / src / login / logind-user.c

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index fdbccb364c1814f45d07249253c9107b8bbee8c7..d48eca47f034607fcaa5cde8320f53c92daa7cc2 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -714,7 +714,7 @@ int user_kill(User *u, int signo) {
 }
 
 void user_elect_display(User *u) {
 }
 
 void user_elect_display(User *u) {

-        Session *graphical = NULL, *text = NULL, *s;
+        Session *graphical = NULL, *text = NULL, *other = NULL, *s;

 
         assert(u);
 
 
         assert(u);
 


@@ -732,22 +732,35 @@ void user_elect_display(User *u) {
 
                 if (SESSION_TYPE_IS_GRAPHICAL(s->type))
                         graphical = s;
 
                 if (SESSION_TYPE_IS_GRAPHICAL(s->type))
                         graphical = s;

-                else
+                else if (s->type == SESSION_TTY)

                         text = s;
                         text = s;

+                else
+                        other = s;

         }
 
         if (graphical &&
             (!u->display ||
              u->display->class != SESSION_USER ||
              u->display->stopping ||
         }
 
         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;
                 u->display = graphical;

+                return;
+        }

 
         if (text &&
             (!u->display ||
              u->display->class != SESSION_USER ||
 
         if (text &&
             (!u->display ||
              u->display->class != SESSION_USER ||

-             u->display->stopping))
+             u->display->stopping ||
+             u->display->type != SESSION_TTY)) {

                 u->display = text;
                 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] = {
 }
 
 static const char* const user_state_table[_USER_STATE_MAX] = {