From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 9 Jan 2024 03:20:41 +0000 (+0900)
Subject: network/route-nexthop: make GatewayOnLink= support an empty string
X-Git-Tag: v256-rc1~1167^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4207f6c05d0fe41422ae7294081af79fe43a5992;p=thirdparty%2Fsystemd.git

network/route-nexthop: make GatewayOnLink= support an empty string

And invalidate the route section if an invalid string is specified.
---

diff --git a/src/network/networkd-route-nexthop.c b/src/network/networkd-route-nexthop.c
index 3b1da1801f0..c1b191b3ef6 100644
--- a/src/network/networkd-route-nexthop.c
+++ b/src/network/networkd-route-nexthop.c
@@ -124,14 +124,10 @@ int config_parse_route_gateway_onlink(
                 return 0;
         }
 
-        r = parse_boolean(rvalue);
-        if (r < 0) {
-                log_syntax(unit, LOG_WARNING, filename, line, r,
-                           "Could not parse %s=\"%s\", ignoring assignment: %m", lvalue, rvalue);
-                return 0;
-        }
-
-        route->gateway_onlink = r;
+        r = config_parse_tristate(unit, filename, line, section, section_line, lvalue, ltype, rvalue,
+                                  &route->gateway_onlink, network);
+        if (r <= 0)
+                return r;
 
         TAKE_PTR(route);
         return 0;
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index e34ebcca6ea..f5efc7618a8 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -1064,7 +1064,7 @@ int config_parse_tristate(
 
         if (isempty(rvalue)) {
                 *t = -1;
-                return 0;
+                return 1;
         }
 
         r = parse_tristate(rvalue, t);
@@ -1074,7 +1074,7 @@ int config_parse_tristate(
                 return 0;
         }
 
-        return 0;
+        return 1;
 }
 
 int config_parse_string(