summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-21 15:07:36 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-21 15:07:36 +0200
commit8163b9f90079af298031dcbffee057fc344470a3 (patch)
treea506286fff27d8ab5a17309eb31a4512b4027364
parent8cc64c2a3640121745fdfaccc6eae896ac25a911 (diff)
downloadsystemd-8163b9f90079af298031dcbffee057fc344470a3.tar.gz
logind: fix emission of PropertiesChanged for users
The same as parent commit, but users. This is the third and last foo_object_find() function in logind, so I think that this particular family of bugs is finally squashed.
-rw-r--r--src/login/logind-dbus.c1
-rw-r--r--src/login/logind-user-dbus.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 91c3bd362e..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))
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) {