chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: allow unprivileged session-device access
[elogind.git]
/
src
/
login
/
logind-device.c
diff --git
a/src/login/logind-device.c
b/src/login/logind-device.c
index 2bcd6a10c5432cdbd2eaee4d92373e82664bf4b8..9ff91ba03568b2472aee6c229d783d8fcdbf02af 100644
(file)
--- a/
src/login/logind-device.c
+++ b/
src/login/logind-device.c
@@
-67,13
+67,17
@@
void device_free(Device *d) {
void device_detach(Device *d) {
Seat *s;
void device_detach(Device *d) {
Seat *s;
+ SessionDevice *sd;
assert(d);
if (!d->seat)
return;
assert(d);
if (!d->seat)
return;
+ while ((sd = d->session_devices))
+ session_device_free(sd);
+
s = d->seat;
s = d->seat;
- LIST_REMOVE(
Device,
devices, d->seat->devices, d);
+ LIST_REMOVE(devices, d->seat->devices, d);
d->seat = NULL;
if (!seat_has_master_device(s)) {
d->seat = NULL;
if (!seat_has_master_device(s)) {
@@
-106,11
+110,11
@@
void device_attach(Device *d, Seat *s) {
* per seat, so we iterate only a few times. */
if (d->master || !s->devices)
* per seat, so we iterate only a few times. */
if (d->master || !s->devices)
- LIST_PREPEND(
Device,
devices, s->devices, d);
+ LIST_PREPEND(devices, s->devices, d);
else {
LIST_FOREACH(devices, i, s->devices) {
if (!i->devices_next || !i->master) {
else {
LIST_FOREACH(devices, i, s->devices) {
if (!i->devices_next || !i->master) {
- LIST_INSERT_AFTER(
Device,
devices, s->devices, i, d);
+ LIST_INSERT_AFTER(devices, s->devices, i, d);
break;
}
}
break;
}
}