From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 23 Apr 2017 12:52:15 +0000 (+0100)
Subject: Fix DISABLE_DKIM biuld
X-Git-Tag: exim-4_90_RC1~185
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/09d5060c04058260ec6191fc98b49941d6c3cdb5

Fix DISABLE_DKIM biuld
---

diff --git a/src/src/dkim_transport.c b/src/src/dkim_transport.c
index c8ac92e16..552e1beb1 100644
--- a/src/src/dkim_transport.c
+++ b/src/src/dkim_transport.c
@@ -7,13 +7,13 @@
 
 /* Transport shim for dkim signing */
 
-#ifndef DISABLE_DKIM
-
 
 #include "exim.h"
 
+#ifndef DISABLE_DKIM	/* rest of file */
+
 #ifdef HAVE_LINUX_SENDFILE
-#include <sys/sendfile.h>
+# include <sys/sendfile.h>
 #endif
 
 
@@ -157,7 +157,7 @@ mean they go out in the same packet as the MAIL, RCPT and (first) BDAT commands
 (transport_write_message() sizes the BDAT for the buffered amount) - for short
 messages, the BDAT LAST command.  We want no CRLF or dotstuffing expansion */
 
-tctx->options &= ~topt_use_crlf;
+tctx->options &= ~(topt_use_crlf | topt_escape_headers);
 transport_write_reset(0);
 if (  !write_chunk(tctx, dkim_signature, siglen)
    || !write_chunk(tctx, hdrs, hsize))