logind: always kill session when termination is requested

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

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index b8f18c47a33bc715327e39369730a756c9430593..631be5f7409830d87592f6b278ce3057911e1b6a 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -139,8 +139,8 @@ int seat_save(Seat *s) {
                 fputs("UIDS=", f);
                 LIST_FOREACH(sessions_by_seat, i, s->sessions)
                         fprintf(f,
-                                "%lu%c",
-                                (unsigned long) i->user->uid,
+                                UID_FMT"%c",
+                                i->user->uid,
                                 i->sessions_by_seat_next ? ' ' : '\n');
         }
 
@@ -154,7 +154,7 @@ int seat_save(Seat *s) {
 
 finish:
         if (r < 0)
-                log_error("Failed to save seat data for %s: %s", s->id, strerror(-r));
+                log_error("Failed to save seat data %s: %s", s->state_file, strerror(-r));
 
         return r;
 }
@@ -418,7 +418,7 @@ int seat_start(Seat *s) {
         return 0;
 }
 
-int seat_stop(Seat *s) {
+int seat_stop(Seat *s, bool force) {
         int r = 0;
 
         assert(s);
@@ -430,7 +430,7 @@ int seat_stop(Seat *s) {
                            "MESSAGE=Removed seat %s.", s->id,
                            NULL);
 
-        seat_stop_sessions(s);
+        seat_stop_sessions(s, force);
 
         unlink(s->state_file);
         seat_add_to_gc_queue(s);
@@ -443,14 +443,14 @@ int seat_stop(Seat *s) {
         return r;
 }
 
-int seat_stop_sessions(Seat *s) {
+int seat_stop_sessions(Seat *s, bool force) {
         Session *session;
         int r = 0, k;
 
         assert(s);
 
         LIST_FOREACH(sessions_by_seat, session, s->sessions) {
-                k = session_stop(session);
+                k = session_stop(session, force);
                 if (k < 0)
                         r = k;
         }