From 2924a6c927cee6ce3f9677991b5b4ecbd4e9a12a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 23 Jul 2025 22:18:17 +0900 Subject: [PATCH] network/json: ignore -ENODATA and any failures from sd_dhcp_lease_get_sip() Addresses https://github.com/systemd/systemd/pull/38269#discussion_r2225375899. Follow-up for 238c427aa9c4bc28c1840e550551a984b33d44da. --- src/network/networkd-json.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c index aa65379acc..d7bea039fd 100644 --- a/src/network/networkd-json.c +++ b/src/network/networkd-json.c @@ -846,14 +846,11 @@ static int sip_append_json(Link *link, sd_json_variant **v) { union in_addr_union s; int n_sip; - n_sip = sd_dhcp_lease_get_sip(link->dhcp_lease, &sip); - if (n_sip <= 0) - return 0; - r = sd_dhcp_lease_get_server_identifier(link->dhcp_lease, &s.in); if (r < 0) return r; + n_sip = sd_dhcp_lease_get_sip(link->dhcp_lease, &sip); for (int i = 0; i < n_sip; i++) { r = server_append_json_one_addr(AF_INET, &(union in_addr_union) { .in = sip[i], },