From: Phil Pennock <pdp@exim.org>
Date: Wed, 5 Oct 2011 23:36:34 +0000 (-0400)
Subject: Apply patch from Dmitry Isaikin fixing log.c format string.
X-Git-Tag: exim-4_77_RC4~1
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/d690cbdcc1eae1eb60e83caf6800f768b733dadd

Apply patch from Dmitry Isaikin fixing log.c format string.

fixes bug 1152.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b58444a55..9a518e9d2 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -123,6 +123,11 @@ PP/11 match_* no longer expand right-hand-side by default.
 
 PP/12 fix uninitialised greeting string from PP/03 (smtps client support).
 
+PP/13 shell and compiler warnings fixes for RC1-RC3 changes.
+
+PP/14 fix log_write() format string regression from TF/03.
+      Bugzilla 1152.  Patch from Dmitry Isaikin.
+
 
 Exim version 4.76
 -----------------
diff --git a/src/src/log.c b/src/src/log.c
index fbab77caf..a3ec18d9f 100644
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -713,7 +713,7 @@ DEBUG(D_any|D_v)
       }
     }
 
-  sprintf(CS ptr, "%s%s%s%s%s\n  ",
+  sprintf(CS ptr, "%s%s%s%s\n  ",
     ((flags & LOG_MAIN) != 0)?    " MAIN"   : "",
     ((flags & LOG_PANIC) != 0)?   " PANIC"  : "",
     ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE)? " DIE" : "",