git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
311fbe5
)
Fix non-ARC build
author
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 26 Mar 2018 17:44:33 +0000
(18:44 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 26 Mar 2018 17:44:33 +0000
(18:44 +0100)
src/src/verify.c
patch
|
blob
|
history
diff --git
a/src/src/verify.c
b/src/src/verify.c
index 1555838acecda3c5abbebea7d232af4691f1a2cf..ffa6a14f9b9c70496d1548be78d691881c90eb51 100644
(file)
--- a/
src/src/verify.c
+++ b/
src/src/verify.c
@@
-1033,11
+1033,20
@@
no_conn:
cutthrough.delivery= FALSE;
HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
}
cutthrough.delivery= FALSE;
HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
}
- if (ob->dkim.dkim_domain || ob->arc_sign)
+#ifndef DISABLE_DKIM
+ if (ob->dkim.dkim_domain)
{
cutthrough.delivery= FALSE;
{
cutthrough.delivery= FALSE;
- HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of DKIM
or ARC
signing\n");
+ HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of DKIM signing\n");
}
}
+#endif
+#ifdef EXPERIMENTAL_ARC
+ if (ob->arc_sign)
+ {
+ cutthrough.delivery= FALSE;
+ HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of ARC signing\n");
+ }
+#endif
}
if ( (cutthrough.delivery || options & vopt_callout_hold)
}
if ( (cutthrough.delivery || options & vopt_callout_hold)