fanf2 2005/09/22 13:02:22 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src acl.c
Log:
A tweak to change PH/13, so that verify=helo never defers (as in 4.52).
Revision Changes Path
1.239 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.49 +2 -4 exim/exim-src/src/acl.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -u -r1.238 -r1.239
--- ChangeLog 19 Sep 2005 18:00:47 -0000 1.238
+++ ChangeLog 22 Sep 2005 12:02:21 -0000 1.239
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.238 2005/09/19 18:00:47 fanf2 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -215,6 +215,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
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -u -r1.48 -r1.49
--- acl.c 13 Sep 2005 18:06:30 -0000 1.48
+++ acl.c 22 Sep 2005 12:02:22 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.48 2005/09/13 18:06:30 fanf2 Exp $ */
+/* $Cambridge: exim/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 @@
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
