picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #13811 from keszybz/logind-signal-emitting-fix

Browse source 
Logind signal emitting fix
This commit is contained in:
Anita Zhang 2019-10-21 17:13:57 -07:00 committed by GitHub
parent 6880558020 e48a1e3423
commit 5b90e5f3f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.mailmap
View file

@ -191,6 +191,7 @@ Yann E. Morin <yann.morin.1998@free.fr>
Yin Kangkai <kangkai.yin@intel.com> <kangkai.yin@linux.intel.com>
Zachary Winnerman <33329648+winnerman-pythian@users.noreply.github.com>
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> <you@example.com>
Łukasz Stelmach <l.stelmach@samsung.com> <stlman@poczta.fm>
Jonathon Kowalski <bl0pbl33p@gmail.com>
Diego Canuhe <dcanuhe@gmail.com> <46734128+dcanuhe@users.noreply.github.com>

2
NEWS
View file

@ -473,7 +473,7 @@ CHANGES WITH 243:
de Souza Cascardo, Theo Ouzhinski, Thiebaud Weksteen, Thomas Haller,
Thomas Weißschuh, Tomas Mraz, Tommi Rantala, Topi Miettinen, VD-Lycos,
ven, Wieland Hoffmann, William A. Kennington III, William Wold, Xi
Ruoyao, Yuri Chornoivan, Yu Watanabe, Your Name, Zach Smith, Zbigniew
Ruoyao, Yuri Chornoivan, Yu Watanabe, Zach Smith, Zbigniew
Jędrzejewski-Szmek, Zhang Xianwei
– Camerino, 2019-09-03

2
src/login/logind-dbus.c
View file

@ -163,7 +163,6 @@ int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid,
User *user;
assert(m);
assert(message);
assert(ret);
if (!uid_is_valid(uid))
@ -189,7 +188,6 @@ int manager_get_seat_from_creds(
int r;
assert(m);
assert(message);
assert(ret);
if (SEAT_IS_SELF(name) || SEAT_IS_AUTO(name)) {

3
src/login/logind-device.c
View file

@ -91,14 +91,13 @@ void device_attach(Device *d, Seat *s) {
if (d->master || !s->devices)
LIST_PREPEND(devices, s->devices, d);
else {
else
LIST_FOREACH(devices, i, s->devices) {
if (!i->devices_next || !i->master) {
LIST_INSERT_AFTER(devices, s->devices, i, d);
break;
}
}
}
if (!had_master && d->master && s->started) {
seat_save(s);

2
src/login/logind-seat-dbus.c
View file

@ -280,8 +280,6 @@ int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
return -ENOMEM;
message = sd_bus_get_current_message(bus);
if (!message)
return 0;
r = manager_get_seat_from_creds(m, message, e, error, &seat);
if (r == -ENXIO) {

2
src/login/logind-user-dbus.c
View file

@ -244,8 +244,6 @@ int user_object_find(sd_bus *bus, const char *path, const char *interface, void
sd_bus_message *message;
message = sd_bus_get_current_message(bus);
if (!message)
return 0;
r = manager_get_user_from_creds(m, message, UID_INVALID, error, &user);
if (r == -ENXIO) {