X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-util.c;h=bf8fb409059d95266f926fcc69e62a52038bf99b;hb=27e72d6b22890ba4a8cbc05c49667cd1cccf1461;hp=13ad4442ba261f5f0342f0d9a6e818cc90600fe4;hpb=8be28fb1e0aa57b2a6ba7736440c9bba54cb86d1;p=elogind.git

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 13ad4442b..bf8fb4090 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -628,7 +628,7 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) {
         return 0;
 }
 
-int bus_print_all_properties(sd_bus *bus, const char *path, char **filter, bool all) {
+int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, char **filter, bool all) {
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
@@ -637,7 +637,7 @@ int bus_print_all_properties(sd_bus *bus, const char *path, char **filter, bool
         assert(path);
 
         r = sd_bus_call_method(bus,
-                        "org.freedesktop.machine1",
+                        dest,
                         path,
                         "org.freedesktop.DBus.Properties",
                         "GetAll",
@@ -671,8 +671,14 @@ int bus_print_all_properties(sd_bus *bus, const char *path, char **filter, bool
                         r = bus_print_property(name, reply, all);
                         if (r < 0)
                                 return r;
-                        if (r == 0 && all)
-                                printf("%s=[unprintable]\n", name);
+                        if (r == 0) {
+                                if (all)
+                                        printf("%s=[unprintable]\n", name);
+                                /* skip what we didn't read */
+                                r = sd_bus_message_skip(reply, contents);
+                                if (r < 0)
+                                        return r;
+                        }
 
                         r = sd_bus_message_exit_container(reply);
                         if (r < 0)
@@ -866,7 +872,7 @@ int bus_map_all_properties(sd_bus *bus,
                                 return r;
 
                         v = (uint8_t *)userdata + prop->offset;
-                                if (map[i].set)
+                        if (map[i].set)
                                 r = prop->set(bus, member, m, &error, v);
                         else
                                 r = map_basic(bus, member, m, &error, v);