From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 21 May 2020 06:36:01 +0000 (+0200)
Subject: network: allow empty assignment to PreferredLifetime=
X-Git-Tag: v246-rc1~297^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10b20e5a936e28de47b8c42fab8d73bce528fa8e;p=thirdparty%2Fsystemd.git

network: allow empty assignment to PreferredLifetime=

Users might want to use that to unset a previous setting. The docs seem OK as
they are: we don't need to explictly mention the empty value, since it is
almost always allowed.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index f9bbd05dd8b..9b78530334a 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -967,8 +967,8 @@ int config_parse_lifetime(const char *unit,
         if (r < 0)
                 return r;
 
-        /* We accept only "forever", "infinity", or "0". */
-        if (STR_IN_SET(rvalue, "forever", "infinity"))
+        /* We accept only "forever", "infinity", empty, or "0". */
+        if (STR_IN_SET(rvalue, "forever", "infinity", ""))
                 k = CACHE_INFO_INFINITY_LIFE_TIME;
         else if (streq(rvalue, "0"))
                 k = 0;