From: Todd Lyons <tlyons@exim.org>
Date: Wed, 28 May 2014 15:48:45 +0000 (-0700)
Subject: Bug 1444: Fix \r\n handling writing spool file
X-Git-Tag: exim-4_83_RC2~11
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/6eb02f881ddd9af83d697244ec35704c8dfbe9a8

Bug 1444: Fix \r\n handling writing spool file

Fix a bug which causes DKIM signatures to fail because what gets
  written to the spool file is different than what gets passed through
  the DKIM code.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ee56623ad..a1ef01912 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -123,6 +123,9 @@ TL/11 Bug 1119: fix memory allocation in string_printing2().  Patch from
 
 JH/24 The OCSP stapling feature is moved from Experimental into the mainline.
 
+TL/12 Bug 1444: Fix improper \r\n sequence handling when writing spool
+      file.  Patch from Wolfgang Breyha.
+
 
 Exim version 4.82
 -----------------
diff --git a/src/src/receive.c b/src/src/receive.c
index ea957c7cf..ac3f0cf07 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -684,6 +684,7 @@ while ((ch = (receive_getc)()) != EOF)
 
     case 1:                         /* After written "\n" */
     if (ch == '.') { ch_state = 3; continue; }
+    if (ch == '\r') { ch_state = 2; continue; }
     if (ch != '\n') ch_state = 0; else linelength = -1;
     break;