From a9bd4b4ed97c7a6b909febe89a9d2be2c78f3f74 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 23 Jan 2023 13:15:27 +0100 Subject: [PATCH] os-util: accept SUPPORT_END= with empty string as explicit way to disable concept --- src/basic/os-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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), -- 2.47.3