From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 1 Apr 2026 14:32:41 +0000 (+0900)
Subject: network: drop unmet conditions
X-Git-Tag: v261-rc1~136^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5bcbb4c85b35aea1e1647a56e434ede4f21218b;p=thirdparty%2Fsystemd.git

network: drop unmet conditions

Now sd_dhcp_lease object always wraps sd_dhcp_message object, hence we
can unconditionally use it.
---

diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c
index 35c32a0d18b..dcf74d4b8b0 100644
--- a/src/network/networkd-json.c
+++ b/src/network/networkd-json.c
@@ -6,7 +6,7 @@
 #include "sd-dhcp-client.h"
 #include "sd-dhcp6-client.h"
 
-#include "dhcp-lease-internal.h"
+#include "dhcp-lease-internal.h"         /* IWYU pragma: keep */
 #include "dhcp-server-lease-internal.h"
 #include "dhcp6-lease-internal.h"
 #include "extract-word.h"
@@ -1354,11 +1354,9 @@ static int dhcp_client_lease_append_json(Link *link, sd_json_variant **v) {
                 return r;
 
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *m = NULL;
-        if (link->dhcp_lease->message) {
-                r = dhcp_message_build_json(link->dhcp_lease->message, &m);
-                if (r < 0)
-                        return r;
-        }
+        r = dhcp_message_build_json(link->dhcp_lease->message, &m);
+        if (r < 0)
+                return r;
 
         r = sd_json_buildo(
                         &w,
@@ -1428,19 +1426,6 @@ static int dhcp_client_private_options_append_json(Link *link, sd_json_variant *
         if (!link->dhcp_lease)
                 return 0;
 
-        if (!link->dhcp_lease->message) {
-                LIST_FOREACH(options, option, link->dhcp_lease->private_options) {
-                        r = sd_json_variant_append_arraybo(
-                                        &array,
-                                        SD_JSON_BUILD_PAIR_UNSIGNED("Option", option->tag),
-                                        SD_JSON_BUILD_PAIR_HEX("PrivateOptionData", option->data, option->length));
-                        if (r < 0)
-                                return r;
-                }
-
-                return json_variant_set_field_non_null(v, "PrivateOptions", array);
-        }
-
         for (uint8_t i = SD_DHCP_OPTION_PRIVATE_BASE; i <= SD_DHCP_OPTION_PRIVATE_LAST; i++) {
                 _cleanup_(iovec_done) struct iovec iov = {};
                 r = dhcp_message_get_option_alloc(link->dhcp_lease->message, i, &iov);