From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 23 Jan 2023 12:15:27 +0000 (+0100)
Subject: os-util: accept SUPPORT_END= with empty string as explicit way to disable concept
X-Git-Tag: v253-rc1~11^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9bd4b4ed97c7a6b909febe89a9d2be2c78f3f74;p=thirdparty%2Fsystemd.git

os-util: accept SUPPORT_END= with empty string as explicit way to disable concept
---

diff --git a/src/basic/os-util.c b/src/basic/os-util.c
index 3a2e4f59a69..3b50279a443 100644
--- a/src/basic/os-util.c
+++ b/src/basic/os-util.c
@@ -349,14 +349,14 @@ int os_release_support_ended(const char *support_end, bool quiet) {
                 if (r < 0 && r != -ENOENT)
                         return log_full_errno(quiet ? LOG_DEBUG : LOG_WARNING, r,
                                               "Failed to read os-release file, ignoring: %m");
-                if (!_support_end_alloc)
-                        return false;  /* no end date defined */
 
                 support_end = _support_end_alloc;
         }
 
-        struct tm tm = {};
+        if (isempty(support_end)) /* An empty string is a explicit way to say "no EOL exists" */
+                return false;  /* no end date defined */
 
+        struct tm tm = {};
         const char *k = strptime(support_end, "%Y-%m-%d", &tm);
         if (!k || *k)
                 return log_full_errno(quiet ? LOG_DEBUG : LOG_WARNING, SYNTHETIC_ERRNO(EINVAL),