From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 Nov 2023 17:30:20 +0000 (+0900)
Subject: network/dhcp6: skip to check existence of DHCPv6 address when UseAddress=no
X-Git-Tag: v255-rc2~50^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc4aa64c2d7bf1443bf30b66d334e33addb0d27a;p=thirdparty%2Fsystemd.git

network/dhcp6: skip to check existence of DHCPv6 address when UseAddress=no

Follow-up for 1536b7b2d00819615bf8eba194de7ccd20c3689f and
5f950e56211a90b21e8096ebf27c9c2b8afbd231.

Fixes #29979.
---

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 6d38840ccb5..ee20d0ed50a 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -99,13 +99,15 @@ int dhcp6_check_ready(Link *link) {
         int r;
 
         assert(link);
+        assert(link->network);
 
         if (link->dhcp6_messages > 0) {
                 log_link_debug(link, "%s(): DHCPv6 addresses and routes are not set.", __func__);
                 return 0;
         }
 
-        if (!link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP6)) {
+        if (link->network->dhcp6_use_address &&
+            !link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP6)) {
                 Address *address;
 
                 SET_FOREACH(address, link->addresses)