ph10 2005/08/02 10:24:46 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/transports smtp.c
exim-test-orig/AutoTest/confs 034
Log:
Named domain lists were not working in queue_smtp_domains.
Revision Changes Path
1.192 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.14 +2 -2 exim/exim-src/src/transports/smtp.c
1.2 +2 -1 exim/exim-test-orig/AutoTest/confs/034
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- ChangeLog 2 Aug 2005 09:09:27 -0000 1.191
+++ ChangeLog 2 Aug 2005 09:24:45 -0000 1.192
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.191 2005/08/02 09:09:27 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -36,6 +36,9 @@
file for comments.
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
Index: smtp.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smtp.c 29 Jun 2005 14:17:01 -0000 1.13
+++ smtp.c 2 Aug 2005 09:24:45 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.13 2005/06/29 14:17:01 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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)
Index: 034
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/034,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 034 8 Oct 2004 14:49:15 -0000 1.1
+++ 034 2 Aug 2005 09:24:45 -0000 1.2
@@ -11,10 +11,11 @@
# ----- Main settings -----
domainlist local_domains = test.ex : myhost.ex
+domainlist some_domains = ten-1.test.ex
queue_domains = !unknown.test.ex : !^ten-\\d+\\.test\\.ex\$ : *.test.ex
queue_run_in_order
-queue_smtp_domains = !ten-1.test.ex : \N^ten-\d+\.test\.ex$\N
+queue_smtp_domains = !+some_domains : \N^ten-\d+\.test\.ex$\N
# ----- Routers -----
