From ffad01c81e8c73c2ba0c81e2c14b7221ea08cf02 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 12 Jan 2024 15:29:11 +0900 Subject: [PATCH] network/route-nexthop: always reset gateway address when _dhcp or friends is specified to Gateway= Just for safety. --- src/network/networkd-route-nexthop.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; } -- 2.47.3