Cutthrough: fix operation under -bhc to not actually deliver. Bug 1800

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

diff --git a/src/src/acl.c b/src/src/acl.c
index 684b93bbb31641bb4e59784b1f3d9589e91f4e09..d508a29e772c9b6bb78e50fd24ea963110f9ce82 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -4509,12 +4509,14 @@ case ACL_WHERE_RCPT:
 #ifndef DISABLE_PRDR
 case ACL_WHERE_PRDR:
 #endif
-  if (rc == OK  &&  cutthrough.delivery  && rcpt_count > cutthrough.nrcpt)
+  if (host_checking_callout)   /* -bhc mode */
+    cancel_cutthrough_connection("host-checking mode");
+  else if (rc == OK && cutthrough.delivery && rcpt_count > cutthrough.nrcpt)
     open_cutthrough_connection(addr);
   break;
 
 case ACL_WHERE_PREDATA:
-  if( rc == OK )
+  if (rc == OK)
     cutthrough_predata();
   else
     cancel_cutthrough_connection("predata acl not ok");