Cutthrough: fix multi-message initiating connections. Bug 2230

[exim.git] / src / src / acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index f01f5cf3c0410b271b9a6ae0f7d9d75d346281c1..9efc85844ca484d02f5c3040fb31848ed6cf4dc4 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -3287,6 +3287,8 @@ for (; cb != NULL; cb = cb->next)
                p = pp;
                }
              }
+           else
+             DEBUG(D_acl) debug_printf(" cutthrough request ignored for nonfirst rcpt\n");
            break;
            }
          *log_msgptr = string_sprintf("\"control=%s\" on %s item",
@@ -4417,22 +4419,29 @@ switch (where)
     else if (  rc == OK
            && cutthrough.delivery
            && rcpt_count > cutthrough.nrcpt
-           && (rc = open_cutthrough_connection(addr)) == DEFER
            )
-      if (cutthrough.defer_pass)
-       {
-       uschar * s = addr->message;
-       /* Horrid kludge to recover target's SMTP message */
-       while (*s) s++;
-       do --s; while (!isdigit(*s));
-       if (*--s && isdigit(*s) && *--s && isdigit(*s)) *user_msgptr = s;
-       acl_temp_details = TRUE;
-       }
-      else
-       {
-       HDEBUG(D_acl) debug_printf_indent("cutthrough defer; will spool\n");
-       rc = OK;
-       }
+      {
+      if ((rc = open_cutthrough_connection(addr)) == DEFER)
+       if (cutthrough.defer_pass)
+         {
+         uschar * s = addr->message;
+         /* Horrid kludge to recover target's SMTP message */
+         while (*s) s++;
+         do --s; while (!isdigit(*s));
+         if (*--s && isdigit(*s) && *--s && isdigit(*s)) *user_msgptr = s;
+         acl_temp_details = TRUE;
+         }
+       else
+         {
+         HDEBUG(D_acl) debug_printf_indent("cutthrough defer; will spool\n");
+         rc = OK;
+         }
+      }
+    else HDEBUG(D_acl) if (cutthrough.delivery)
+      if (rcpt_count <= cutthrough.nrcpt)
+       debug_printf_indent("ignore cutthrough request; nonfirst message\n");
+      else if (rc != OK)
+       debug_printf_indent("ignore cutthrough request; ACL did not accept\n");
     break;
 
   case ACL_WHERE_PREDATA: