A tweak to change PH/13, so that verify=helo never defers (as in 4.52).

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 390f04d2392647482891bab57d4541a4cce2916c..03be2f063b3e116e7644be87c8f0f1b4169e1acf 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.238 2005/09/19 18:00:47 fanf2 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.239 2005/09/22 12:02:21 fanf2 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -216,6 +216,11 @@ TF/07 Exim produced the error message "an SRV record indicated no SMTP
       service" if it encountered an MX record with an empty target hostname.
       The message is now "an MX or SRV record indicated no SMTP service".
 
+TF/08 Change PH/13 introduced the possibility that verify=helo may defer,
+      if the DNS of the sending site is misconfigured. This is quite a
+      common situation. This change restores the behaviour of treating a
+      helo verification defer as a failure.
+
 
 Exim version 4.52
 -----------------

diff --git a/src/src/acl.c b/src/src/acl.c
index b582df7ea1029f7c6fc15cb4f7bbb84980864709..c06707ec68ffebaf1e72c4adba9cce1e719782b0 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.48 2005/09/13 18:06:30 fanf2 Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.49 2005/09/22 12:02:22 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1391,10 +1391,8 @@ occurred earlier. If not, we can attempt the verification now. */
 if (strcmpic(ss, US"helo") == 0)
   {
   if (slash != NULL) goto NO_OPTIONS;
-  if (helo_verified) return OK;
-  if (helo_verify_failed) return FAIL;
-  if (smtp_verify_helo()) return helo_verified? OK : FAIL;
-  return DEFER;
+  if (!helo_verified && !helo_verify_failed) smtp_verify_helo();
+  return helo_verified? OK : FAIL;
   }
 
 /* Do Client SMTP Authorization checks in a separate function, and turn the