network: do not require DHCPv6 addresses when UseAddress=no

yuwata · keszybz · commit 8cd37e4354a5 · 2021-04-09T08:15:34.000+02:00
Follow-up for 1536b7b. Fixes systemd#19196.
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
@@ -25,6 +25,13 @@
 #include "radv-internal.h"
 #include "web-util.h"
 
+bool link_dhcp6_with_address_enabled(Link *link) {
+        if (!link_dhcp6_enabled(link))
+                return false;
+
+        return link->network->dhcp6_use_address;
+}
+
 bool link_dhcp6_pd_is_enabled(Link *link) {
         assert(link);
 
diff --git a/src/network/networkd-dhcp6.h b/src/network/networkd-dhcp6.h
@@ -26,6 +26,7 @@ typedef struct DHCP6DelegatedPrefix {
 DHCP6DelegatedPrefix *dhcp6_pd_free(DHCP6DelegatedPrefix *p);
 DEFINE_TRIVIAL_CLEANUP_FUNC(DHCP6DelegatedPrefix*, dhcp6_pd_free);
 
+bool link_dhcp6_with_address_enabled(Link *link);
 bool link_dhcp6_pd_is_enabled(Link *link);
 int dhcp6_pd_remove(Link *link);
 int dhcp6_configure(Link *link);
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
@@ -779,7 +779,7 @@ void link_check_ready(Link *link) {
                                 break;
                         }
 
-                if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link) || link_ipv4ll_enabled(link)) &&
+                if ((link_dhcp4_enabled(link) || link_dhcp6_with_address_enabled(link) || link_ipv4ll_enabled(link)) &&
                     !link->dhcp_address && set_isempty(link->dhcp6_addresses) && !has_ndisc_address &&
                     !link->ipv4ll_address_configured)
                         /* When DHCP[46] or IPv4LL is enabled, at least one address is acquired by them. */

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ void link_check_ready(Link *link) {`
`779`	`779`	`break;`
`780`	`780`	`}`
`781`	`781`
`782`		`- if ((link_dhcp4_enabled(link) \|\| link_dhcp6_enabled(link) \|\| link_ipv4ll_enabled(link)) &&`
	`782`	`+ if ((link_dhcp4_enabled(link) \|\| link_dhcp6_with_address_enabled(link) \|\| link_ipv4ll_enabled(link)) &&`
`783`	`783`	`!link->dhcp_address && set_isempty(link->dhcp6_addresses) && !has_ndisc_address &&`
`784`	`784`	`!link->ipv4ll_address_configured)`
`785`	`785`	`/* When DHCP[46] or IPv4LL is enabled, at least one address is acquired by them. */`