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=887de47f314dbf67dc05420abe088d134fe99174;hp=631be5f7409830d87592f6b278ce3057911e1b6a;hb=c04b6b9bfe4a498a61ac34038bb9523ca9edfc36;hpb=9bb69af4f2823fdd30902f5ffd959e9b041feb53;ds=sidebyside
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 631be5f74..887de47f3 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -19,21 +19,18 @@
along with systemd; If not, see .
***/
-#include
#include
#include
#include
-#include
-#include
#include
-#include "sd-id128.h"
#include "sd-messages.h"
#include "logind-seat.h"
#include "logind-acl.h"
#include "util.h"
#include "mkdir.h"
-#include "path-util.h"
+#include "formats-util.h"
+#include "terminal-util.h"
Seat *seat_new(Manager *m, const char *id) {
Seat *s;
@@ -120,9 +117,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 +151,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;
}
@@ -168,14 +165,12 @@ int seat_load(Seat *s) {
}
static int vt_allocate(unsigned int vtnr) {
- _cleanup_free_ char *p = NULL;
+ char p[sizeof("/dev/tty") + DECIMAL_STR_MAX(unsigned int)];
_cleanup_close_ int fd = -1;
assert(vtnr >= 1);
- if (asprintf(&p, "/dev/tty%u", vtnr) < 0)
- return -ENOMEM;
-
+ snprintf(p, sizeof(p), "/dev/tty%u", vtnr);
fd = open_terminal(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
if (fd < 0)
return -errno;
@@ -183,34 +178,6 @@ static int vt_allocate(unsigned int vtnr) {
return 0;
}
-int seat_preallocate_vts(Seat *s) {
- int r = 0;
- unsigned i;
-
- assert(s);
- assert(s->manager);
-
- log_debug("Preallocating VTs...");
-
- if (s->manager->n_autovts <= 0)
- return 0;
-
- if (!seat_has_vts(s))
- return 0;
-
- for (i = 1; i <= s->manager->n_autovts; i++) {
- int q;
-
- q = vt_allocate(i);
- if (q < 0) {
- log_error("Failed to preallocate VT %i: %s", i, strerror(-q));
- r = q;
- }
- }
-
- return r;
-}
-
int seat_apply_acls(Seat *s, Session *old_active) {
int r;
@@ -223,7 +190,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;
}
@@ -274,11 +241,16 @@ int seat_set_active(Seat *s, Session *session) {
int seat_switch_to(Seat *s, unsigned int num) {
/* Public session positions skip 0 (there is only F1-F12). Maybe it
* will get reassigned in the future, so return error for now. */
- if (!num)
+ if (num == 0)
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]);
}
@@ -286,7 +258,7 @@ int seat_switch_to(Seat *s, unsigned int num) {
int seat_switch_to_next(Seat *s) {
unsigned int start, i;
- if (!s->position_count)
+ if (s->position_count == 0)
return -EINVAL;
start = 1;
@@ -307,7 +279,7 @@ int seat_switch_to_next(Seat *s) {
int seat_switch_to_previous(Seat *s) {
unsigned int start, i;
- if (!s->position_count)
+ if (s->position_count == 0)
return -EINVAL;
start = 1;
@@ -337,14 +309,25 @@ int seat_active_vt_changed(Seat *s, unsigned int vtnr) {
log_debug("VT changed to %u", vtnr);
+ /* we might have earlier closing sessions on the same VT, so try to
+ * find a running one first */
LIST_FOREACH(sessions_by_seat, i, s->sessions)
- if (i->vtnr == vtnr) {
+ if (i->vtnr == vtnr && !i->stopping) {
new_active = i;
break;
}
+ if (!new_active) {
+ /* no running one? then we can't decide which one is the
+ * active one, let the first one win */
+ LIST_FOREACH(sessions_by_seat, i, s->sessions)
+ if (i->vtnr == vtnr) {
+ new_active = i;
+ break;
+ }
+ }
+
r = seat_set_active(s, new_active);
- manager_spawn_autovt(s->manager, vtnr);
return r;
}
@@ -397,14 +380,11 @@ 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 */
- seat_preallocate_vts(s);
-
/* Read current VT */
seat_read_active_vt(s);
@@ -425,9 +405,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);
@@ -459,15 +439,27 @@ int seat_stop_sessions(Seat *s, bool force) {
}
void seat_evict_position(Seat *s, Session *session) {
+ Session *iter;
unsigned int pos = session->pos;
session->pos = 0;
- if (!pos)
+ if (pos == 0)
return;
- if (pos < s->position_count && s->positions[pos] == session)
+ if (pos < s->position_count && s->positions[pos] == session) {
s->positions[pos] = NULL;
+
+ /* There might be another session claiming the same
+ * position (eg., during gdm->session transition), so let's look
+ * for it and set it on the free slot. */
+ LIST_FOREACH(sessions_by_seat, iter, s->sessions) {
+ if (iter->pos == pos) {
+ s->positions[pos] = iter;
+ break;
+ }
+ }
+ }
}
void seat_claim_position(Seat *s, Session *session, unsigned int pos) {
@@ -575,7 +567,7 @@ bool seat_can_graphical(Seat *s) {
int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
Session *session;
bool idle_hint = true;
- dual_timestamp ts = { 0, 0 };
+ dual_timestamp ts = DUAL_TIMESTAMP_NULL;
assert(s);