From 65d73cf042ba7de11d254f5c4714f467db64b7c3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 6 Aug 2015 16:46:16 +0300 Subject: 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. --- src/machine/machined-dbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/machine') 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; -- cgit v1.2.3-54-g00ecf