Named domain lists were not working in queue_smtp_domains.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dfaa2aa75b9dbcb506fb64fe9ba239f41a1e4b64..b3748b053b0a7fce478bb93bb3b931d6b8f02977 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.191 2005/08/02 09:09:27 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.192 2005/08/02 09:24:45 ph10 Exp $

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


@@ -37,6 +37,9 @@ PH/08 Arrange for USE_INET_NTOA_FIX to be set in config.h for AIX systems as
 
 PH/09 Installed latest Cygwin configuration files from the Cygwin maintainer.
 
 
 PH/09 Installed latest Cygwin configuration files from the Cygwin maintainer.
 

+PH/10 Named domain lists were not working if used in a queue_smtp_domains
+      setting.
+

 
 Exim version 4.52
 -----------------
 
 Exim version 4.52
 -----------------

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index dd6f3089bcb5d11e0effb5bb72759af633558506..5c73110715399e9d2550945e93749d7363f5e492 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/smtp.c,v 1.13 2005/06/29 14:17:01 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/smtp.c,v 1.14 2005/08/02 09:24:45 ph10 Exp $ */

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


@@ -2317,8 +2317,8 @@ for (cutoff_retry = 0; expired &&
     doing a two-stage queue run, don't do this if forcing. */
 
     if ((!deliver_force || queue_2stage) && (queue_smtp ||
     doing a two-stage queue run, don't do this if forcing. */
 
     if ((!deliver_force || queue_2stage) && (queue_smtp ||

-        match_isinlist(addrlist->domain, &queue_smtp_domains, 0, NULL, NULL,
-          MCL_DOMAIN, TRUE, NULL) == OK))
+        match_isinlist(addrlist->domain, &queue_smtp_domains, 0,
+          &domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL) == OK))

       {
       expired = FALSE;
       for (addr = addrlist; addr != NULL; addr = addr->next)
       {
       expired = FALSE;
       for (addr = addrlist; addr != NULL; addr = addr->next)