shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-06 13:17:44 +03:00
Code

Merge pull request #13996 from poettering/utc-fix

Browse Source 
accept UTC timezone explicitly, even if timezone data is missing
This commit is contained in:
Anita Zhang 2019-11-11 17:47:43 -08:00 committed by GitHub
commit 4da0b33511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/time-util.c
View File

@ -1258,6 +1258,7 @@ int get_timezones(char ***ret) {
}
strv_sort(zones);
strv_uniq(zones);
} else if (errno != ENOENT)
return -errno;
@ -1277,6 +1278,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;