and "err_perm", deprecated since 4.83 when the RFC-defined words
"temperror" and "permerror" were introduced.
+JH/34 Re-introduce enforcement of no cutthrough delivery on transports having
+ transport-filters or DKIM-signing. The restriction was lost in the
+ consolidation of verify-callout and delivery SMTP handling.
+
Exim version 4.90
-----------------
here is where we want to leave the conn open. Ditto for a lazy-close
verify. */
+ if (cutthrough.delivery)
+ {
+ if (addr->transport->filter_command)
+ {
+ cutthrough.delivery= FALSE;
+ HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
+ }
+ if (ob->dkim.dkim_domain)
+ {
+ cutthrough.delivery= FALSE;
+ HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of DKIM signing\n");
+ }
+ }
+
if ( (cutthrough.delivery || options & vopt_callout_hold)
&& rcpt_count == 1
&& done