Prevent TLS rebinding in LDAP connections

[exim.git] / src / exim_monitor / em_log.c

diff --git a/src/exim_monitor/em_log.c b/src/exim_monitor/em_log.c
index 3f4551a07c3c90a9670b949307a82049015f7d33..0441edd2eb84f0a7d61d158d46658fc7cc77149f 100644 (file)
--- a/src/exim_monitor/em_log.c
+++ b/src/exim_monitor/em_log.c
@@ -2,7 +2,7 @@
 *                 Exim Monitor                   *
 *************************************************/
 
 *                 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. */
 
 /* This module contains code for scanning the main log,
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code for scanning the main log,


@@ -56,6 +56,8 @@ static int scrolled = FALSE;
 static int size = 0;
 static int top = 0;
 
 static int size = 0;
 static int top = 0;
 

+static void show_log(char *s, ...) PRINTF_FUNCTION(1,2);
+

 static void show_log(char *s, ...)
 {
 int length, newtop;
 static void show_log(char *s, ...)
 {
 int length, newtop;


@@ -362,6 +364,8 @@ link count of zero on the currently open file. */
 if (log_datestamping)
   {
   uschar log_file_wanted[256];
 if (log_datestamping)
   {
   uschar log_file_wanted[256];

+  /* 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)
     {
   string_format(log_file_wanted, sizeof(log_file_wanted), CS log_file);
   if (Ustrcmp(log_file_wanted, log_file_open) != 0)
     {