shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-03 05:18:09 +03:00
Code

timesync: fix serialization of IP address

Browse Source 
Fixes: #11169
This commit is contained in:
Lennart Poettering 2018-12-17 15:30:23 +01:00 committed by Yu Watanabe
parent 98a7b55a53
commit 1a126325eb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/timesync/timesyncd-bus.c
View File

@ -80,6 +80,8 @@ static int property_get_current_server_address(
if (!a) if (!a)
return sd_bus_message_append(reply, "(iay)", AF_UNSPEC, 0); 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"); r = sd_bus_message_open_container(reply, 'r', "iay");
if (r < 0) if (r < 0)
return r; return r;
@ -88,7 +90,9 @@ static int property_get_current_server_address(
if (r < 0) if (r < 0)
return r; 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) if (r < 0)
return r; return r;