Pay attention to local part prefixes and suffixes when doing callouts.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4d7dd8517bf83a0c0e419c5278f138c891db782e..fb21a0f77f313ecfb88abb52fef6a9a18e98e2a9 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.117 2005/04/06 15:26:52 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.118 2005/04/06 16:26:42 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -190,6 +190,13 @@ PH/30 In these circumstances:
       and peerdn, if requested) that were in fact used only for the second
       address.
 
       and peerdn, if requested) that were in fact used only for the second
       address.
 

+PH/31 When doing a callout as part of verifying an address, Exim was not paying
+      attention to any local part prefix or suffix that was matched by the
+      router that accepted the address. It now behaves in the same way as it
+      does for delivery: the affixes are removed from the local part unless
+      rcpt_include_affixes is set on the transport.
+
+

 
 A note about Exim versions 4.44 and 4.50
 ----------------------------------------
 
 A note about Exim versions 4.44 and 4.50
 ----------------------------------------

diff --git a/src/README.UPDATING b/src/README.UPDATING
index b83ca2ab48f1b55e786d1246243ca9e8aebb8b0a..c91c5768069d185e6dee6e173167f67c1a5e5776 100644 (file)
--- a/src/README.UPDATING
+++ b/src/README.UPDATING
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/README.UPDATING,v 1.5 2005/03/08 11:38:21 ph10 Exp $
+$Cambridge: exim/src/README.UPDATING,v 1.6 2005/04/06 16:26:42 ph10 Exp $

 
 This document contains detailed information about incompatibilities that might
 be encountered when upgrading from one release of Exim to another. The
 
 This document contains detailed information about incompatibilities that might
 be encountered when upgrading from one release of Exim to another. The


@@ -31,8 +31,8 @@ that might affect a running system.
 Version 4.51
 ------------
 
 Version 4.51
 ------------
 

-The format in which GnuTLS parameters are cached (in the file gnutls-params in
-the spool directory) has been changed. The new format can also be generated
+1. The format in which GnuTLS parameters are cached (in the file gnutls-params
+in the spool directory) has been changed. The new format can also be generated

 externally, so it is now possible to update the values from outside Exim. This
 has been implemented in an upwards, BUT NOT downwards, compatible manner.
 Upgrading should be seamless: when Exim finds that it cannot understand an
 externally, so it is now possible to update the values from outside Exim. This
 has been implemented in an upwards, BUT NOT downwards, compatible manner.
 Upgrading should be seamless: when Exim finds that it cannot understand an


@@ -41,6 +41,15 @@ in the new format. If, however, you downgrade from 4.51 to a previous release,
 you MUST delete the gnutls-params file in the spool directory, because the
 older Exim will not recognize the new format.
 
 you MUST delete the gnutls-params file in the spool directory, because the
 older Exim will not recognize the new format.
 

+2. When doing a callout as part of verifying an address, Exim was not paying
+attention to any local part prefix or suffix that was matched by the router
+that accepted the address. It now behaves in the same way as it does for
+delivery: the affixes are removed from the local part unless
+rcpt_include_affixes is set on the transport. If you have a configuration that
+uses prefixes or suffixes on addresses that could be used for callouts, and you
+want the affixes to be retained, you must make sure that rcpt_include_affixes
+is set on the transport.
+

 
 Version 4.50
 ------------
 
 Version 4.50
 ------------

diff --git a/src/src/verify.c b/src/src/verify.c
index 458f4d97849418db6a79c240787ff177f355a219..75e3ce7c6fa71f7ed6c83704d6f400c258a03f30 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/verify.c,v 1.15 2005/02/17 11:58:26 ph10 Exp $ */
+/* $Cambridge: exim/src/src/verify.c,v 1.16 2005/04/06 16:26:42 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -550,7 +550,8 @@ for (host = host_list; host != NULL && !done; host = host->next)
       {
       done =
         smtp_write_command(&outblock, FALSE, "RCPT TO:<%.1000s>\r\n",
       {
       done =
         smtp_write_command(&outblock, FALSE, "RCPT TO:<%.1000s>\r\n",

-          addr->address) >= 0 &&
+          transport_rcpt_address(addr,
+            addr->transport->rcpt_include_affixes)) >= 0 &&

         smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer),
           '2', callout);
 
         smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer),
           '2', callout);