diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-03-04 00:36:24 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-03-04 16:07:03 +0900 |
| commit | da46a1bc3cd28ac36114002c216196dae004b05c (patch) | |
| tree | 895aac62a2547e1f3916be671d62fd1b5812145f /src/shared/conf-parser.c | |
| parent | 0746159886ef87a90e7fb7f805e92206a5d20f36 (diff) | |
| download | systemd-da46a1bc3cd28ac36114002c216196dae004b05c.tar.gz | |
core: fix mtime calculation of dropin files
Nominally, the bug was in unit_load_dropin(), which just took the last mtime
instead of calculating the maximum. But instead of adding code to wrap the
loop, this patch goes in the other direction.
All (correct) callers of config_parse() followed a very similar pattern to
calculate the maximum mtime. So let's simplify things by making config_parse()
assume that mtime is initialized and update it to the maximum. This makes all
the callers that care about mtime simpler and also fixes the issue in
unit_load_dropin().
config_parse_many_nulstr() and config_parse_many() are different, because it
makes sense to call them just once, and current ret_mtime behaviour make sense.
Fixes #17730, https://bugzilla.redhat.com/show_bug.cgi?id=1933137.
Diffstat (limited to 'src/shared/conf-parser.c')
| -rw-r--r-- | src/shared/conf-parser.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 64ed2571e9..9dfa190751 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -263,7 +263,7 @@ int config_parse( const void *table, ConfigParseFlags flags, void *userdata, - usec_t *ret_mtime) { + usec_t *latest_mtime) { _cleanup_free_ char *section = NULL, *continuation = NULL; _cleanup_fclose_ FILE *ours = NULL; @@ -275,6 +275,9 @@ int config_parse( assert(filename); assert(lookup); + /* latest_mtime is an input-output parameter: it will be updated if the mtime of the file we're + * looking at is later than the current *latest_mtime value. */ + if (!f) { f = ours = fopen(filename, "re"); if (!f) { @@ -417,8 +420,8 @@ int config_parse( } } - if (ret_mtime) - *ret_mtime = mtime; + if (latest_mtime) + *latest_mtime = MAX(*latest_mtime, mtime); return 1; } @@ -448,12 +451,9 @@ static int config_parse_many_files( /* Then read all the drop-ins. */ STRV_FOREACH(fn, files) { - usec_t t; - - r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t); + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); if (r < 0) return r; - mtime = MAX(mtime, t); /* Find the newest */ } if (ret_mtime) |