From e8b9e9c4705b4bc157ff460371387339977f233b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 Nov 2019 16:53:52 +0100 Subject: [PATCH] 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) --- src/basic/time-util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 837948c253..a70fc41d1a 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;