diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/transports/smtp.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index dfaa2aa75..b3748b053 100644 --- 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 ------------------------------------------- @@ -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/10 Named domain lists were not working if used in a queue_smtp_domains + setting. + Exim version 4.52 ----------------- diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index dd6f3089b..5c7311071 100644 --- 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 * @@ -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 || - 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) |