X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine%2Fmachine-dbus.c;h=89c93779d37337d461912cc73c3c4694c982bc73;hp=daa60d11e48912f75bdbe8b0501d21def4d5b0fd;hb=e70bc43cdf75b36e7ad3d29e9a6f8ee1461e7d5e;hpb=9d485985338a46b8cb1acdf1af6c1eb2e88acfee;ds=sidebyside diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index daa60d11e..89c93779d 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -233,12 +233,12 @@ int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void if (r < 0) return sd_bus_error_set_errno(error, r); - r = sd_bus_message_open_container(reply, 'a', "(yay)"); + r = sd_bus_message_open_container(reply, 'a', "(iay)"); if (r < 0) return sd_bus_error_set_errno(error, r); for (;;) { - unsigned char family; + int family; ssize_t n; union in_addr_union in_addr; struct iovec iov[2]; @@ -256,11 +256,11 @@ int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void if ((size_t) n < sizeof(family)) break; - r = sd_bus_message_open_container(reply, 'r', "yay"); + r = sd_bus_message_open_container(reply, 'r', "iay"); if (r < 0) return sd_bus_error_set_errno(error, r); - r = sd_bus_message_append(reply, "y", family); + r = sd_bus_message_append(reply, "i", family); if (r < 0) return sd_bus_error_set_errno(error, r); @@ -405,7 +405,7 @@ const sd_bus_vtable machine_vtable[] = { SD_BUS_PROPERTY("State", "s", property_get_state, 0, 0), SD_BUS_METHOD("Terminate", NULL, NULL, bus_machine_method_terminate, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)), SD_BUS_METHOD("Kill", "si", NULL, bus_machine_method_kill, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)), - SD_BUS_METHOD("GetAddresses", NULL, "a(yay)", bus_machine_method_get_addresses, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("GetAddresses", NULL, "a(iay)", bus_machine_method_get_addresses, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("GetOSRelease", NULL, "a{ss}", bus_machine_method_get_os_release, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_VTABLE_END };