dbus: return non-zero return value in the case that prefix won't match

strv_extend returns 0 in the case of success which means that
else if (bus_track_deserialize_item(&m->deserialized_subscribed, l) == 0)
        log_warning("Unknown serialization item '%s'", l);
will be printed when value is added correctly.

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 9cb198a13a58bb5c8a3ff81e1abb375467564343..ec1c0d43369dd8daade84de7aab149a4e775bbec 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -1180,7 +1180,7 @@ int bus_track_deserialize_item(char ***l, const char *line) {
 
         e = startswith(line, "subscribed=");
         if (!e)
 
         e = startswith(line, "subscribed=");
         if (!e)

-                return 0;
+                return -EINVAL;

 
         return strv_extend(l, e);
 }
 
         return strv_extend(l, e);
 }

diff --git a/src/core/manager.c b/src/core/manager.c
index 2bc105843692f7b1c2e7ce3044f055dbeebc3995..7abc8a9a5e43c9a7177b4dba56a5b43a1665bc8c 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2408,7 +2408,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
                                 m->kdbus_fd = fdset_remove(fds, fd);
                         }
 
                                 m->kdbus_fd = fdset_remove(fds, fd);
                         }
 

-                } else if (bus_track_deserialize_item(&m->deserialized_subscribed, l) == 0)
+                } else if (bus_track_deserialize_item(&m->deserialized_subscribed, l) < 0)

                         log_warning("Unknown serialization item '%s'", l);
         }
 
                         log_warning("Unknown serialization item '%s'", l);
         }