X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/f1e5fef536bdc2c5d84c4bc7852d6e948253ccaf..ac650c35b3953336dcfdd9565d98bf832f18f641:/src/exim_monitor/em_main.c diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c index 187dba3b0..d210a0717 100644 --- a/src/exim_monitor/em_main.c +++ b/src/exim_monitor/em_main.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/exim_monitor/em_main.c,v 1.6 2009/11/16 19:50:36 nm4 Exp $ */ - /************************************************* * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2012 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -168,7 +166,7 @@ Returns: nothing */ void -log_write(unsigned int selector, int flags, char *format, ...) +log_write(unsigned int selector, int flags, const char *format, ...) { va_list ap; va_start(ap, format); @@ -656,6 +654,8 @@ today.) */ 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;