From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 11 Nov 2019 15:53:52 +0000 (+0100)
Subject: time-util: always accept UTC as valid timezone
X-Git-Tag: v244-rc1~76^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8b9e9c4705b4bc157ff460371387339977f233b;p=thirdparty%2Fsystemd.git

time-util: always accept UTC as valid timezone

We already handle it specially in get_timezones(), hence we should OK it
here too, even if the timezone file doesn't actually exist.

Prompted by:

https://serverfault.com/questions/991172/invalid-time-zone-utc

(Yes, Ubuntu should install the UTC timezone data unconditionally: it
should not be an option, even if all other timezone data is excluded,
but since it's our business to validate user input but not out business
to validate distros, let's just accept "UTC" unconditionally, it's magic
after all)
---

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 837948c2533..a70fc41d1aa 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1277,6 +1277,10 @@ bool timezone_is_valid(const char *name, int log_level) {
         if (isempty(name))
                 return false;
 
+        /* Always accept "UTC" as valid timezone, since it's the fallback, even if user has no timezones installed. */
+        if (streq(name, "UTC"))
+                return true;
+
         if (name[0] == '/')
                 return false;