From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 12 Oct 2020 08:04:04 +0000 (+0900)
Subject: network: warn if dynamic gateway is specified but corresponding protocol is disabled
X-Git-Tag: v247-rc1~72^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=956dbf361b69b8ec818147e29a6b4e5f9f4927cc;p=thirdparty%2Fsystemd.git

network: warn if dynamic gateway is specified but corresponding protocol is disabled
---

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 83a3b35e2c0..707660df3c0 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -2382,7 +2382,7 @@ static int route_section_verify(Route *route, Network *network) {
         if (section_is_invalid(route->section))
                 return -EINVAL;
 
-        if (route->gateway_from_dhcp_or_ra)
+        if (route->gateway_from_dhcp_or_ra) {
                 if (route->gw_family == AF_UNSPEC) {
                         /* When deprecated Gateway=_dhcp is set, then assume gateway family based on other settings. */
                         switch (route->family) {
@@ -2406,6 +2406,19 @@ static int route_section_verify(Route *route, Network *network) {
                         route->gw_family = route->family;
                 }
 
+                if (route->gw_family == AF_INET && !FLAGS_SET(network->dhcp, ADDRESS_FAMILY_IPV4))
+                        return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
+                                                 "%s: Gateway=\"_dhcp4\" is specified but DHCPv4 client is disabled. "
+                                                 "Ignoring [Route] section from line %u.",
+                                                 route->section->filename, route->section->line);
+
+                if (route->gw_family == AF_INET6 && !network->ipv6_accept_ra)
+                        return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
+                                                 "%s: Gateway=\"_ipv6ra\" is specified but IPv6AcceptRA= is disabled. "
+                                                 "Ignoring [Route] section from line %u.",
+                                                 route->section->filename, route->section->line);
+        }
+
         /* When only Gateway= is specified, assume the route family based on the Gateway address. */
         if (route->family == AF_UNSPEC)
                 route->family = route->gw_family;