summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-08-06 16:46:16 +0300
committerLennart Poettering <lennart@poettering.net>2015-08-06 16:54:00 +0300
commit65d73cf042ba7de11d254f5c4714f467db64b7c3 (patch)
tree331c269bc6c8da9718a04d0ed75512cb449f86bd /src/machine
parent089157763aee96e36201bf1924fe10c82947a1c7 (diff)
machined,logind: don't generate errors on signal match functions
If we get a weird signal, then we should log about it, but not return an error, since sd-bus will not call us again then anymore, but for these signals we match here we actually do want to be called on the next invocation.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machined-dbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 3637815fc9..b1f5aebe0c 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -1116,7 +1116,7 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err
r = sd_bus_message_read(message, "uoss", &id, &path, &unit, &result);
if (r < 0) {
bus_log_parse_error(r);
- return r;
+ return 0;
}
machine = hashmap_get(m->machine_units, unit);
@@ -1242,7 +1242,7 @@ int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error
r = sd_bus_message_read(message, "b", &b);
if (r < 0) {
bus_log_parse_error(r);
- return r;
+ return 0;
}
if (b)
return 0;