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

Logind signal emitting fix

6 files changed, 3 insertions, 9 deletions

diff --git a/.mailmap b/.mailmap
index 4764ad670a..28b60946ac 100644
--- a/.mailmap
+++ b/.mailmap
@@ -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>
diff --git a/NEWS b/NEWS
index de4f93a79b..38287deee6 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 20a8591bd8..6b3f2a731b 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -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)) {
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 20108544aa..9a62217290 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -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);
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 3c58929611..9958490875 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -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) {
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index beb97362e7..a6e2d4950d 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -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) {