diff options
Diffstat (limited to 'src/timesync/timesyncd-bus.c')
| -rw-r--r-- | src/timesync/timesyncd-bus.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/timesync/timesyncd-bus.c b/src/timesync/timesyncd-bus.c index f2527f52e4..5a5896f0b7 100644 --- a/src/timesync/timesyncd-bus.c +++ b/src/timesync/timesyncd-bus.c @@ -80,6 +80,8 @@ static int property_get_current_server_address( if (!a) return sd_bus_message_append(reply, "(iay)", AF_UNSPEC, 0); + assert(IN_SET(a->sockaddr.sa.sa_family, AF_INET, AF_INET6)); + r = sd_bus_message_open_container(reply, 'r', "iay"); if (r < 0) return r; @@ -88,7 +90,9 @@ static int property_get_current_server_address( if (r < 0) return r; - r = sd_bus_message_append_array(reply, 'y', &a->sockaddr.in.sin_addr, FAMILY_ADDRESS_SIZE(a->sockaddr.sa.sa_family)); + r = sd_bus_message_append_array(reply, 'y', + a->sockaddr.sa.sa_family == AF_INET ? (void*) &a->sockaddr.in.sin_addr : (void*) &a->sockaddr.in6.sin6_addr, + FAMILY_ADDRESS_SIZE(a->sockaddr.sa.sa_family)); if (r < 0) return r; @@ -185,7 +189,7 @@ int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add manager object vtable: %m"); - r = bus_request_name_async_may_reload_dbus(m->bus, NULL, "org.freedesktop.timesync1", 0, NULL); + r = sd_bus_request_name_async(m->bus, NULL, "org.freedesktop.timesync1", 0, NULL, NULL); if (r < 0) return log_error_errno(r, "Failed to request name: %m"); |