]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network/json: ignore -ENODATA and any failures from sd_dhcp_lease_get_sip()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 23 Jul 2025 13:18:17 +0000 (22:18 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 23 Jul 2025 13:24:19 +0000 (22:24 +0900)
Addresses https://github.com/systemd/systemd/pull/38269#discussion_r2225375899.

Follow-up for 238c427aa9c4bc28c1840e550551a984b33d44da.

src/network/networkd-json.c

index aa65379acc8e2197fbfecd6c726f5dffe193c7d5..d7bea039fd78d465cabf8ca6d53e8afb435567d7 100644 (file)
@@ -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], },