summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-04-23 13:52:15 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2017-04-23 13:52:15 +0100
commit09d5060c04058260ec6191fc98b49941d6c3cdb5 (patch)
tree9729512f0175e45f93f1b5dbddf6801e6c4c896c
parent42055a338593d66f0abb6eeb6b03f0eaf4439f57 (diff)
Fix DISABLE_DKIM biuld
-rw-r--r--src/src/dkim_transport.c8
1 files changed, 4 insertions, 4 deletions
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))