relicense to LGPLv2.1 (with exceptions)

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

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 8c83a2c5ecd3088c256580c3bbd7a771779cbe56..1bae6f6e0780fb877ccdd64e72c6e6c6ad9279c4 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -6,16 +6,16 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -30,6 +30,7 @@
 #include "logind-seat.h"
 #include "logind-acl.h"
 #include "util.h"
+#include "mkdir.h"
 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;
@@ -390,18 +391,19 @@ int seat_attach_session(Seat *s, Session *session) {
         assert(session);
         assert(!session->seat);
 
-        if (!seat_can_multi_session(s) && s->sessions)
-                return -EEXIST;
-
         session->seat = s;
         LIST_PREPEND(Session, sessions_by_seat, s->sessions, session);
 
         seat_send_changed(s, "Sessions\0");
 
-        if (!seat_can_multi_session(s)) {
-                assert(!s->active);
+        /* Note that even if a seat is not multi-session capable it
+         * still might have multiple sessions on it since old, dead
+         * sessions might continue to be tracked until all their
+         * processes are gone. The most recently added session
+         * (i.e. the first in s->sessions) is the one that matters. */
+
+        if (!seat_can_multi_session(s))
                 seat_set_active(s, session);
-        }
 
         return 0;
 }