chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: connect directly via kdbus in sd_bus_open_system_container()
[elogind.git]
/
src
/
login
/
logind-seat.c
diff --git
a/src/login/logind-seat.c
b/src/login/logind-seat.c
index eac5a5f26b144de064d61ea0ea0a9183a52c248f..c73860478d1619dd71bdfd897fd0d9880ffa2a0a 100644
(file)
--- a/
src/login/logind-seat.c
+++ b/
src/login/logind-seat.c
@@
-51,7
+51,7
@@
Seat *seat_new(Manager *m, const char *id) {
return NULL;
}
return NULL;
}
- s->id =
path_get_file_
name(s->state_file);
+ s->id =
base
name(s->state_file);
s->manager = m;
if (hashmap_put(m->seats, s->id, s) < 0) {
s->manager = m;
if (hashmap_put(m->seats, s->id, s) < 0) {
@@
-408,6
+408,9
@@
int seat_attach_session(Seat *s, Session *session) {
assert(session);
assert(!session->seat);
assert(session);
assert(!session->seat);
+ if (!seat_has_vts(s) != !session->vtnr)
+ return -EINVAL;
+
session->seat = s;
LIST_PREPEND(sessions_by_seat, s->sessions, session);
session->seat = s;
LIST_PREPEND(sessions_by_seat, s->sessions, session);