Cutthrough: enforce non-use in combination with DKIM signing or transport filter

Broken-by: 02b41d7106

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index af186d2e361b3b0279bdb2a404986d16f6c79f8b..9a05c34713783d04e13fa693e0ca6d3e82a929da 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -160,6 +160,10 @@ JH/28 Ensure that variables possibly set during message acceptance are marked
 PP/02 DANE: add dane_require_tls_ciphers SMTP Transport option; if unset,
       tls_require_ciphers is used as before.
 
+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
 -----------------

diff --git a/src/src/verify.c b/src/src/verify.c
index 9582fe5b7407b1f1002c0a7f7625bb137148dd70..1df856604a066c012ae829ba2e669f56aa2c873d 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1026,6 +1026,20 @@ no_conn:
     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