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 b58444a5546a1c694ece7fdd82f76d3bc02c309d..9a518e9d29e05037415eae6a19dbaa44257bb7ff 100644 (file)
--- 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 fbab77caf6ba01b2e5558c6d14f1e8dd72a5edb0..a3ec18d9f79036a313d9d6eec91fcb796accc287 100644 (file)
--- 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" : "",