From: Jeremy Harris Date: Mon, 26 Mar 2018 17:44:33 +0000 (+0100) Subject: Fix non-ARC build X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/72cb765f4ce4f9b503e45060b42e33f1248e8b64?ds=sidebyside Fix non-ARC build --- diff --git a/src/src/verify.c b/src/src/verify.c index 1555838ac..ffa6a14f9 100644 --- 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"); } - if (ob->dkim.dkim_domain || ob->arc_sign) +#ifndef DISABLE_DKIM + if (ob->dkim.dkim_domain) { 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)