git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert "%s" addition in em_main.c, broke %D in log_file.
[users/heiko/exim.git]
/
src
/
exim_monitor
/
em_main.c
diff --git
a/src/exim_monitor/em_main.c
b/src/exim_monitor/em_main.c
index 187dba3b06f9782519a62b6cdf14b9601df8fe5e..a0b94b168f9e730ba96c9019411eac1128141b32 100644
(file)
--- a/
src/exim_monitor/em_main.c
+++ b/
src/exim_monitor/em_main.c
@@
-1,5
+1,3
@@
-/* $Cambridge: exim/src/exim_monitor/em_main.c,v 1.6 2009/11/16 19:50:36 nm4 Exp $ */
-
/*************************************************
* Exim Monitor *
*************************************************/
/*************************************************
* Exim Monitor *
*************************************************/
@@
-168,7
+166,7
@@
Returns: nothing
*/
void
*/
void
-log_write(unsigned int selector, int flags, char *format, ...)
+log_write(unsigned int selector, int flags, c
onst c
har *format, ...)
{
va_list ap;
va_start(ap, format);
{
va_list ap;
va_start(ap, format);
@@
-656,6
+654,8
@@
today.) */
if (log_file[0] != 0)
{
if (log_file[0] != 0)
{
+ /* Do *not* use "%s" here, we need the %D datestamp in the log_file to
+ be expanded! */
(void)string_format(log_file_open, sizeof(log_file_open), CS log_file);
log_datestamping = string_datestamp_offset >= 0;
(void)string_format(log_file_open, sizeof(log_file_open), CS log_file);
log_datestamping = string_datestamp_offset >= 0;