X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-seat.c;h=8eb5e3ee0a58d72d4f261fb3798a424c8144621c;hp=3f5efdc8ea706f8195b463163f838a5d4d34fd75;hb=b298e98413a8bd112f0f7bd91a0dff3e7e931424;hpb=61376f96a98291b5421bfd79a15ca4db50c2a3fe

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 3f5efdc8e..8eb5e3ee0 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -120,9 +120,9 @@ int seat_save(Seat *s) {
 
                 fprintf(f,
                         "ACTIVE=%s\n"
-                        "ACTIVE_UID=%lu\n",
+                        "ACTIVE_UID="UID_FMT"\n",
                         s->active->id,
-                        (unsigned long) s->active->user->uid);
+                        s->active->user->uid);
         }
 
         if (s->sessions) {
@@ -154,7 +154,7 @@ int seat_save(Seat *s) {
 
 finish:
         if (r < 0)
-                log_error("Failed to save seat data %s: %s", s->state_file, strerror(-r));
+                log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
 
         return r;
 }
@@ -201,7 +201,7 @@ int seat_preallocate_vts(Seat *s) {
 
                 q = vt_allocate(i);
                 if (q < 0) {
-                        log_error("Failed to preallocate VT %i: %s", i, strerror(-q));
+                        log_error_errno(q, "Failed to preallocate VT %i: %m", i);
                         r = q;
                 }
         }
@@ -221,7 +221,7 @@ int seat_apply_acls(Seat *s, Session *old_active) {
                             !!s->active, s->active ? s->active->user->uid : 0);
 
         if (r < 0)
-                log_error("Failed to apply ACLs: %s", strerror(-r));
+                log_error_errno(r, "Failed to apply ACLs: %m");
 
         return r;
 }
@@ -275,8 +275,13 @@ int seat_switch_to(Seat *s, unsigned int num) {
         if (!num)
                 return -EINVAL;
 
-        if (num >= s->position_count || !s->positions[num])
+        if (num >= s->position_count || !s->positions[num]) {
+                /* allow switching to unused VTs to trigger auto-activate */
+                if (seat_has_vts(s) && num < 64)
+                        return chvt(num);
+
                 return -EINVAL;
+        }
 
         return session_activate(s->positions[num]);
 }
@@ -395,9 +400,9 @@ int seat_start(Seat *s) {
                 return 0;
 
         log_struct(LOG_INFO,
-                   MESSAGE_ID(SD_MESSAGE_SEAT_START),
+                   LOG_MESSAGE_ID(SD_MESSAGE_SEAT_START),
                    "SEAT_ID=%s", s->id,
-                   "MESSAGE=New seat %s.", s->id,
+                   LOG_MESSAGE("New seat %s.", s->id),
                    NULL);
 
         /* Initialize VT magic stuff */
@@ -423,9 +428,9 @@ int seat_stop(Seat *s, bool force) {
 
         if (s->started)
                 log_struct(LOG_INFO,
-                           MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
+                           LOG_MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
                            "SEAT_ID=%s", s->id,
-                           "MESSAGE=Removed seat %s.", s->id,
+                           LOG_MESSAGE("Removed seat %s.", s->id),
                            NULL);
 
         seat_stop_sessions(s, force);
@@ -485,7 +490,7 @@ void seat_claim_position(Seat *s, Session *session, unsigned int pos) {
         if (seat_has_vts(s))
                 pos = session->vtnr;
 
-        if (!GREEDY_REALLOC0_T(s->positions, s->position_count, pos + 1))
+        if (!GREEDY_REALLOC0(s->positions, s->position_count, pos + 1))
                 return;
 
         seat_evict_position(s, session);