From a0cd6da5bb4a62aa0d26cb2c38182d6324dc529c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 14 Jul 2019 10:30:24 +0900 Subject: [PATCH] network: honor IPv6AcceptRA.UseDomains= setting --- src/network/networkd-link.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 5565e08..d7c2d39 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3557,14 +3557,16 @@ int link_save(Link *link) { fputs_with_space(f, p, NULL, &space); if (link->network->dhcp_use_domains == DHCP_USE_DOMAINS_YES) { - NDiscDNSSL *dd; - if (dhcp_domainname) fputs_with_space(f, dhcp_domainname, NULL, &space); if (dhcp_domains) fputstrv(f, dhcp_domains, NULL, &space); if (dhcp6_domains) fputstrv(f, dhcp6_domains, NULL, &space); + } + + if (link->network->ipv6_accept_ra_use_domains == DHCP_USE_DOMAINS_YES) { + NDiscDNSSL *dd; SET_FOREACH(dd, link->ndisc_dnssl, i) fputs_with_space(f, NDISC_DNSSL_DOMAIN(dd), NULL, &space); @@ -3578,14 +3580,16 @@ int link_save(Link *link) { fputs_with_space(f, p, NULL, &space); if (link->network->dhcp_use_domains == DHCP_USE_DOMAINS_ROUTE) { - NDiscDNSSL *dd; - if (dhcp_domainname) fputs_with_space(f, dhcp_domainname, NULL, &space); if (dhcp_domains) fputstrv(f, dhcp_domains, NULL, &space); if (dhcp6_domains) fputstrv(f, dhcp6_domains, NULL, &space); + } + + if (link->network->ipv6_accept_ra_use_domains == DHCP_USE_DOMAINS_ROUTE) { + NDiscDNSSL *dd; SET_FOREACH(dd, link->ndisc_dnssl, i) fputs_with_space(f, NDISC_DNSSL_DOMAIN(dd), NULL, &space); -- 2.7.4