diff options
| author | Phil Pennock <pdp@exim.org> | 2013-06-04 17:34:36 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2013-06-04 17:34:36 -0400 |
| commit | 8c02018827314fde071df70e2e1e080d241ffc49 (patch) | |
| tree | b266623a9f6d5e93aafd4012e278dc1794d04f76 | |
| parent | d73757b42fbf0a1dea47211dd025215ba9a36568 (diff) | |
Fix eximon continuous updating with timestamped log-files.
Report and fix from Heiko Schlichting.
Fixes 1363.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 6 | ||||
| -rw-r--r-- | src/exim_monitor/em_log.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 11079a298..e0411bab6 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -196,6 +196,12 @@ PP/20 Added force_command boolean option to pipe transport. JH/15 AUTH support on callouts (and hence cutthrough-deliveries). Bugzilla 321, 823. +PP/21 Fix eximon continuous updating with timestamped log-files. + Broken in a format-string cleanup in 4.80, missed when I repaired the + other false fix of the same issue. + Report and fix from Heiko Schlichting. + Bugzilla 1363. + Exim version 4.80.1 ------------------- diff --git a/src/exim_monitor/em_log.c b/src/exim_monitor/em_log.c index bd1d462bf..0441edd2e 100644 --- a/src/exim_monitor/em_log.c +++ b/src/exim_monitor/em_log.c @@ -364,7 +364,9 @@ link count of zero on the currently open file. */ if (log_datestamping) { uschar log_file_wanted[256]; - string_format(log_file_wanted, sizeof(log_file_wanted), "%s", CS log_file); + /* Do *not* use "%s" here, we need the %D datestamp in the log_file to + * be expanded! */ + string_format(log_file_wanted, sizeof(log_file_wanted), CS log_file); if (Ustrcmp(log_file_wanted, log_file_open) != 0) { if (LOG != NULL) |