From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 29 Sep 2020 20:29:42 +0000 (+0900)
Subject: network: warn if IPv6ProxyNDPAddress= is set and IPv6ProxyNDP= is disabled
X-Git-Tag: v247-rc1~117^2~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87851e0feb7e8f164487cb3c8c770583b52a8c57;p=thirdparty%2Fsystemd.git

network: warn if IPv6ProxyNDPAddress= is set and IPv6ProxyNDP= is disabled
---

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index a8021f863fa..4d094b107c6 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -290,6 +290,11 @@ int network_verify(Network *network) {
         if (network->keep_configuration < 0)
                 network->keep_configuration = KEEP_CONFIGURATION_NO;
 
+        if (network->ipv6_proxy_ndp == 0 && !set_isempty(network->ipv6_proxy_ndp_addresses)) {
+                log_warning("%s: IPv6ProxyNDP= is disabled. Ignoring IPv6ProxyNDPAddress=.", network->filename);
+                network->ipv6_proxy_ndp_addresses = set_free_free(network->ipv6_proxy_ndp_addresses);
+        }
+
         LIST_FOREACH_SAFE(addresses, address, address_next, network->static_addresses)
                 if (address_section_verify(address) < 0)
                         address_free(address);