From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 12 Jan 2024 06:29:11 +0000 (+0900)
Subject: network/route-nexthop: always reset gateway address when _dhcp or friends is specifie... 
X-Git-Tag: v256-rc1~1167^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F30896%2Fhead;p=thirdparty%2Fsystemd.git

network/route-nexthop: always reset gateway address when _dhcp or friends is specified to Gateway=

Just for safety.
---

diff --git a/src/network/networkd-route-nexthop.c b/src/network/networkd-route-nexthop.c
index c1b191b3ef6..f1d81f2014f 100644
--- a/src/network/networkd-route-nexthop.c
+++ b/src/network/networkd-route-nexthop.c
@@ -62,20 +62,24 @@ int config_parse_gateway(
 
                 if (streq(rvalue, "_dhcp")) {
                         route->gateway_from_dhcp_or_ra = true;
+                        route->gw_family = AF_UNSPEC;
+                        route->gw = IN_ADDR_NULL;
                         TAKE_PTR(route);
                         return 0;
                 }
 
                 if (streq(rvalue, "_dhcp4")) {
-                        route->gw_family = AF_INET;
                         route->gateway_from_dhcp_or_ra = true;
+                        route->gw_family = AF_INET;
+                        route->gw = IN_ADDR_NULL;
                         TAKE_PTR(route);
                         return 0;
                 }
 
                 if (streq(rvalue, "_ipv6ra")) {
-                        route->gw_family = AF_INET6;
                         route->gateway_from_dhcp_or_ra = true;
+                        route->gw_family = AF_INET6;
+                        route->gw = IN_ADDR_NULL;
                         TAKE_PTR(route);
                         return 0;
                 }