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

Logind signal emitting fix
This commit is contained in:
Anita Zhang
2019-10-21 17:13:57 -07:00
committed by GitHub
6 changed files with 3 additions and 9 deletions
-2
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)) {
+1 -2
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
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
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) {