Change misleading debugging wording "lookup deferred" -> "list match

deferred" (because it isn't necessarily a lookup in the Exim sense).

diff --git a/src/src/match.c b/src/src/match.c
index 36094f4a3ca15a19bbea986d30aeaa96777f2375..6ae5a056d17b45fb68a56d90fff0434d5c94bb40 100644 (file)
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/match.c,v 1.12 2006/02/07 11:19:00 ph10 Exp $ */
+/* $Cambridge: exim/src/src/match.c,v 1.13 2006/04/04 09:48:50 ph10 Exp $ */

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


@@ -425,7 +425,7 @@ Returns:       OK    if matched a non-negated item
                FAIL  if expansion force-failed
                FAIL  if matched a negated item
                FAIL  if hit end of list after a non-negated item
                FAIL  if expansion force-failed
                FAIL  if matched a negated item
                FAIL  if hit end of list after a non-negated item

-               DEFER if a lookup deferred or expansion failed
+               DEFER if a something deferred or expansion failed

 */
 
 int
 */
 
 int


@@ -844,10 +844,10 @@ HDEBUG(D_lists)
   debug_printf("%s %s (end of list)\n", ot, (yield == OK)? "no":"yes");
 return (yield == OK)? FAIL : OK;
 
   debug_printf("%s %s (end of list)\n", ot, (yield == OK)? "no":"yes");
 return (yield == OK)? FAIL : OK;
 

-/* Handle lookup defer */
+/* Something deferred */

 
 DEFER_RETURN:
 
 DEFER_RETURN:

-HDEBUG(D_lists) debug_printf("%s lookup deferred for %s\n", ot, sss);
+HDEBUG(D_lists) debug_printf("%s list match deferred for %s\n", ot, sss);

 return DEFER;
 }
 
 return DEFER;
 }
 

diff --git a/src/src/version.c b/src/src/version.c
index 42b5ae392888655f668585489d46d3eca857298e..11e50e5acf84f6d614b1eebba40377574c43fde3 100644 (file)
--- a/src/src/version.c
+++ b/src/src/version.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/version.c,v 1.14 2006/03/20 10:55:21 ph10 Exp $ */
+/* $Cambridge: exim/src/src/version.c,v 1.15 2006/04/04 09:48:50 ph10 Exp $ */

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


@@ -12,7 +12,7 @@
 #include "exim.h"
 
 
 #include "exim.h"
 
 

-#define THIS_VERSION  "4.61-RC1"
+#define THIS_VERSION  "4.61"

 
 
 /* The header file cnumber.h contains a single line containing the
 
 
 /* The header file cnumber.h contains a single line containing the

diff --git a/test/stderr/0475 b/test/stderr/0475
index e254d08f7f17535369ce04106c6b1278ec3997c8..20afb76c7e86c10547b054da5e183df808f48f4a 100644 (file)
--- a/test/stderr/0475
+++ b/test/stderr/0475
@@ -10,7 +10,7 @@
 >>> processing "deny"
 >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
 LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"
 >>> processing "deny"
 >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
 LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"

->>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? lookup deferred for <; 1.2.3.4:5.6.7.8
+>>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8

 >>> deny: condition test deferred
 LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
 >>> using ACL "a2"
 >>> deny: condition test deferred
 LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
 >>> using ACL "a2"

diff --git a/test/stderr/3202 b/test/stderr/3202
index 795623325ad2d2a7f4893f2eba9440de544944ef..665b40191c6169807916ebf419225f2f58818498 100644 (file)
--- a/test/stderr/3202
+++ b/test/stderr/3202
@@ -9,7 +9,7 @@
 >>> using ACL "acl_1_1_1"
 >>> processing "accept"
 >>> check hosts = net-testdb;defer
 >>> using ACL "acl_1_1_1"
 >>> processing "accept"
 >>> check hosts = net-testdb;defer

->>> host in "net-testdb;defer"? lookup deferred for net-testdb;defer
+>>> host in "net-testdb;defer"? list match deferred for net-testdb;defer

 >>> accept: condition test deferred
 LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: condition test deferred
 LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)


@@ -23,7 +23,7 @@ LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> using ACL "acl_1_1_2"
 >>> processing "deny"
 >>> check domains = testdb;defer
 >>> using ACL "acl_1_1_2"
 >>> processing "deny"
 >>> check domains = testdb;defer

->>> y in "testdb;defer"? lookup deferred for testdb;defer
+>>> y in "testdb;defer"? list match deferred for testdb;defer

 >>> deny: condition test deferred
 LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test deferred
 LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)


@@ -37,6 +37,6 @@ LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> using ACL "acl_1_1_3"
 >>> processing "require"
 >>> check local_parts = testdb;defer
 >>> using ACL "acl_1_1_3"
 >>> processing "require"
 >>> check local_parts = testdb;defer

->>> x in "testdb;defer"? lookup deferred for testdb;defer
+>>> x in "testdb;defer"? list match deferred for testdb;defer

 >>> require: condition test deferred
 LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> require: condition test deferred
 LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER

diff --git a/test/stderr/3204 b/test/stderr/3204
index b6ba871bf3fc4afa87f8497532738b70da60efe1..ce0259ff91a3d71268fe49dad88876dcf4c7137d 100644 (file)
--- a/test/stderr/3204
+++ b/test/stderr/3204
@@ -9,6 +9,6 @@
 >>> using ACL "check_recipient"
 >>> processing "deny"
 >>> check senders = testdb;defer
 >>> using ACL "check_recipient"
 >>> processing "deny"
 >>> check senders = testdb;defer

->>> userx@somehost.example.com in "testdb;defer"? lookup deferred for testdb;defer
+>>> userx@somehost.example.com in "testdb;defer"? list match deferred for testdb;defer

 >>> deny: condition test deferred
 LOG: H=[1.2.3.4] F=<userx@somehost.example.com> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> deny: condition test deferred
 LOG: H=[1.2.3.4] F=<userx@somehost.example.com> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER

diff --git a/test/stderr/3205 b/test/stderr/3205
index c1c1da23019586cd12d72f33b7734edf5c6a45a6..ed7d0620233179404600837d7e318ea23ebb6aae 100644 (file)
--- a/test/stderr/3205
+++ b/test/stderr/3205
@@ -9,7 +9,7 @@
 >>> using ACL "acl_1_2_3_4"
 >>> processing "deny"
 >>> check senders = testdb;defer
 >>> using ACL "acl_1_2_3_4"
 >>> processing "deny"
 >>> check senders = testdb;defer

->>> userx@external.test.ex in "testdb;defer"? lookup deferred for testdb;defer
+>>> userx@external.test.ex in "testdb;defer"? list match deferred for testdb;defer

 >>> deny: condition test deferred
 LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> deny: condition test deferred
 LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)


@@ -27,6 +27,6 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes
 >>> accept: condition test failed
 >>> processing "deny"
 >>> check hosts = testdb;defer
 >>> accept: condition test failed
 >>> processing "deny"
 >>> check hosts = testdb;defer

->>> host in "testdb;defer"? lookup deferred for testdb;defer
+>>> host in "testdb;defer"? list match deferred for testdb;defer

 >>> deny: condition test deferred
 LOG: H=[4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
 >>> deny: condition test deferred
 LOG: H=[4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER

diff --git a/test/stderr/3208 b/test/stderr/3208
index 32dfb8b146ae5495426fc15c9449bc4e2cba1299..dbeb10ddca3d1fccdc87b3207dfde576abb17590 100644 (file)
--- a/test/stderr/3208
+++ b/test/stderr/3208
@@ -19,10 +19,10 @@
 >>> test.ex in "!*relay.ex : test.ex : testhack.ex : testhack2.ex : testdb;defer"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded
 >>> test.ex in "!*relay.ex : test.ex : testhack.ex : testhack2.ex : testdb;defer"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded

->>> other.ex in percent_hack_domains? lookup deferred for testdb;defer
+>>> other.ex in percent_hack_domains? list match deferred for testdb;defer

 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a@other.ex>: defer in percent_hack_domains check
 >>> testhack.ex in percent_hack_domains? yes (matched "testhack.ex")
 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a@other.ex>: defer in percent_hack_domains check
 >>> testhack.ex in percent_hack_domains? yes (matched "testhack.ex")

->>> b in percent_hack_domains? lookup deferred for testdb;defer
+>>> b in percent_hack_domains? list match deferred for testdb;defer

 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a%b@testhack.ex>: defer in percent_hack_domains check
 >>> test.ex in percent_hack_domains? no (matched "!test.ex")
 >>> using ACL "check_recipient"
 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a%b@testhack.ex>: defer in percent_hack_domains check
 >>> test.ex in percent_hack_domains? no (matched "!test.ex")
 >>> using ACL "check_recipient"


@@ -35,7 +35,7 @@ LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCP
 >>> test.ex in "!*relay.ex : test.ex : testhack.ex : testhack2.ex : testdb;defer"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded
 >>> test.ex in "!*relay.ex : test.ex : testhack.ex : testhack2.ex : testdb;defer"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded

->>> testhack2.ex in percent_hack_domains? lookup deferred for testdb;defer
+>>> testhack2.ex in percent_hack_domains? list match deferred for testdb;defer

 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a%b@testhack2.ex>: defer in percent_hack_domains check
 >>> yesrelay.ex in percent_hack_domains? no (matched "!*relay.ex")
 >>> using ACL "check_recipient"
 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a%b@testhack2.ex>: defer in percent_hack_domains check
 >>> yesrelay.ex in percent_hack_domains? no (matched "!*relay.ex")
 >>> using ACL "check_recipient"


@@ -66,8 +66,8 @@ LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCP
 >>> accept: condition test failed
 >>> processing "accept"
 >>> check domains = +relay_domains
 >>> accept: condition test failed
 >>> processing "accept"
 >>> check domains = +relay_domains

->>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? lookup deferred for testdb;defer
->>> norelay.ex in "+relay_domains"? lookup deferred for +relay_domains
+>>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? list match deferred for testdb;defer
+>>> norelay.ex in "+relay_domains"? list match deferred for +relay_domains

 >>> accept: condition test deferred
 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a@norelay.ex>: testdb lookup forced DEFER
 >>> testhack.ex in percent_hack_domains? yes (matched "testhack.ex")
 >>> accept: condition test deferred
 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a@norelay.ex>: testdb lookup forced DEFER
 >>> testhack.ex in percent_hack_domains? yes (matched "testhack.ex")


@@ -101,7 +101,7 @@ LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCP
 >>> accept: condition test failed
 >>> processing "accept"
 >>> check domains = +relay_domains
 >>> accept: condition test failed
 >>> processing "accept"
 >>> check domains = +relay_domains

->>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? lookup deferred for testdb;defer
->>> norelay.ex in "+relay_domains"? lookup deferred for +relay_domains
+>>> norelay.ex in "test.ex : testhack.ex : testhack2.ex : yesrelay.ex : testdb;defer"? list match deferred for testdb;defer
+>>> norelay.ex in "+relay_domains"? list match deferred for +relay_domains

 >>> accept: condition test deferred
 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a%norelay.ex@testhack.ex>: testdb lookup forced DEFER
 >>> accept: condition test deferred
 LOG: H=(remote.host) [V4NET.0.0.1] F=<user@remote.host> temporarily rejected RCPT <a%norelay.ex@testhack.ex>: testdb lookup forced DEFER

diff --git a/test/stderr/3210 b/test/stderr/3210
index 5e8ab85a33d471cd251e8872d3105a9cf88f0bd5..c4e40bb14f211f8a42b98d08f39ed71aff257d29 100644 (file)
--- a/test/stderr/3210
+++ b/test/stderr/3210
@@ -24,9 +24,9 @@ internal_search_find: file="NULL"
 database lookup required for defer
 testdb lookup forced DEFER
 lookup deferred: testdb lookup forced DEFER
 database lookup required for defer
 testdb lookup forced DEFER
 lookup deferred: testdb lookup forced DEFER

-test.ex in "testdb;defer"? lookup deferred for testdb;defer
-test.ex in "+defer_lookup : test.ex"? lookup deferred for +defer_lookup
-test.ex in "! +local_domains"? lookup deferred for ! +local_domains
+test.ex in "testdb;defer"? list match deferred for testdb;defer
+test.ex in "+defer_lookup : test.ex"? list match deferred for +defer_lookup
+test.ex in "! +local_domains"? list match deferred for ! +local_domains

 domains check lookup or other defer
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>>
 domains check lookup or other defer
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>>