From 94ef322eb8618c2c4448090146faab976d43e923 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 18 Oct 2019 17:26:29 +0100 Subject: [PATCH] Testsuite: output changes resulting Broken-by: ab0e957b09 --- test/stderr/0078 | 2 +- test/stderr/0117 | 18 +++++++++--------- test/stderr/0145 | 3 +++ test/stderr/0161 | 2 +- test/stderr/0175 | 1 + test/stderr/0183 | 34 ++++++++++++++++++++++++++++++++++ test/stderr/0278 | 2 ++ test/stderr/0342 | 2 ++ test/stderr/0361 | 3 +++ test/stderr/0419 | 3 ++- test/stderr/0426 | 1 + test/stderr/0443 | 1 + test/stderr/0463 | 4 ++++ test/stderr/0469 | 1 + test/stderr/0513 | 1 + test/stderr/0545 | 5 +++++ test/stderr/0606 | 2 ++ test/stderr/3211 | 2 ++ test/stdout/0147 | 2 +- test/stdout/0442 | 2 +- test/stdout/0572 | 2 +- 21 files changed, 78 insertions(+), 15 deletions(-) diff --git a/test/stderr/0078 b/test/stderr/0078 index fc573ce9b..42092c03d 100644 --- a/test/stderr/0078 +++ b/test/stderr/0078 @@ -18,7 +18,7 @@ domain = mxt6.test.ex routed by lookuphost router envelope to: xx@mxt6.test.ex transport: remote_smtp - host ten-1.test.ex [V4NET.0.0.1] MX=5 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/0117 b/test/stderr/0117 index b4e5e8b2d..ad17fd9c1 100644 --- a/test/stderr/0117 +++ b/test/stderr/0117 @@ -15,9 +15,9 @@ domain = mxt9.test.ex routed by lookuphost router envelope to: xxx@mxt9.test.ex transport: - host ten-1.test.ex [V4NET.0.0.1] MX=5 - host ten-2.test.ex [V4NET.0.0.2] MX=6 - host ten-3.test.ex [V4NET.0.0.3] MX=7 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no + host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no + host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -36,9 +36,9 @@ domain = mxt9a.test.ex routed by lookuphost router envelope to: xxx@mxt9a.test.ex transport: - host ten-1.test.ex [V4NET.0.0.1] MX=5 - host ten-2.test.ex [V4NET.0.0.2] MX=6 - host ten-3.test.ex [V4NET.0.0.3] MX=7 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no + host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no + host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -57,7 +57,7 @@ domain = mxt9b.test.ex routed by lookuphost router envelope to: xxx@mxt9b.test.ex transport: - host ten-1.test.ex [V4NET.0.0.1] MX=5 - host ten-2.test.ex [V4NET.0.0.2] MX=6 - host ten-3.test.ex [V4NET.0.0.3] MX=7 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no + host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no + host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0145 b/test/stderr/0145 index cd1151a2b..79a6f4ab1 100644 --- a/test/stderr/0145 +++ b/test/stderr/0145 @@ -12,6 +12,7 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@mxt10.test.ex >>> calling domainlist router +>>> mxt10.test.ex in "*"? yes (matched "*") >>> domainlist router declined for x@mxt10.test.ex >>> "more" is false: skipping remaining routers >>> no more routers @@ -34,6 +35,7 @@ LOG: H=[V4NET.9.8.7] F= rejected RCPT : Sender verify fail >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1.test.ex >>> calling domainlist router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by domainlist router >>> ----------- end verify ------------ >>> require: condition test succeeded in ACL "check_recipient" @@ -42,6 +44,7 @@ LOG: H=[V4NET.9.8.7] F= rejected RCPT : Sender verify fail >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@mxt10.test.ex >>> calling domainlist router +>>> mxt10.test.ex in "*"? yes (matched "*") >>> domainlist router declined for x@mxt10.test.ex >>> "more" is false: skipping remaining routers >>> no more routers diff --git a/test/stderr/0161 b/test/stderr/0161 index 88f106933..d4a6676eb 100644 --- a/test/stderr/0161 +++ b/test/stderr/0161 @@ -23,7 +23,7 @@ domain = mxt6.test.ex routed by lookuphost router envelope to: xx@mxt6.test.ex transport: remote_smtp - host ten-1.test.ex [V4NET.0.0.1] MX=5 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/0175 b/test/stderr/0175 index b2f1c655c..684b2b428 100644 --- a/test/stderr/0175 +++ b/test/stderr/0175 @@ -81,6 +81,7 @@ LOG: H=[V4NET.0.0.0] F= rejected RCPT : Sender >>> fail_sender2 router declined for user@ten-1.test.ex >>> ten-1.test.ex in "! +local_domains"? yes (end of list) >>> calling lookuphost router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by lookuphost router >>> ----------- end verify ------------ >>> require: condition test succeeded in ACL "check_recipient" diff --git a/test/stderr/0183 b/test/stderr/0183 index 44f567bc6..3ed592301 100644 --- a/test/stderr/0183 +++ b/test/stderr/0183 @@ -30,11 +30,13 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@test.again.dns domain = test.again.dns +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns (MX) using fakens DNS lookup of test.again.dns (MX) gave TRY_AGAIN test.again.dns in dns_again_means_nonexist? no (option unset) returning DNS_AGAIN writing neg-cache entry for test.again.dns-MX-xxxx, ttl -1 +test.again.dns MX DNSSEC lookuphost router: defer for userx@test.again.dns message: host lookup did not complete >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -60,7 +62,9 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@test.again.dns domain = test.again.dns +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns-MX: using cached value DNS_AGAIN +test.again.dns MX DNSSEC lookuphost router: defer for abcd@test.again.dns message: host lookup did not complete >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -86,10 +90,12 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex MX DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -128,6 +134,7 @@ expanded list of hosts = 'test.again.dns' options = 'bydns' set transport smtp finding IP address for test.again.dns doing DNS lookup +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns (A) using fakens DNS lookup of test.again.dns (A) gave TRY_AGAIN test.again.dns in dns_again_means_nonexist? no (option unset) @@ -159,6 +166,7 @@ original list of hosts = '$domain' options = 'bydns' expanded list of hosts = 'test.again.dns' options = 'bydns' finding IP address for test.again.dns doing DNS lookup +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns-A: using cached value DNS_AGAIN useryz router: defer for userz@test.again.dns message: host lookup for test.again.dns did not complete (DNS timeout?) @@ -185,7 +193,9 @@ xyz in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for xyz@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA +ten-1.test.ex MX DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -232,10 +242,12 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@test.fail.dns domain = test.fail.dns +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns (MX) using fakens DNS lookup of test.fail.dns (MX) gave NO_RECOVERY returning DNS_FAIL writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1 +test.fail.dns MX DNSSEC lookuphost router: defer for userx@test.fail.dns message: host lookup did not complete >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -261,7 +273,9 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@test.fail.dns domain = test.fail.dns +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns-MX: using cached value DNS_FAIL +test.fail.dns MX DNSSEC lookuphost router: defer for abcd@test.fail.dns message: host lookup did not complete >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -287,10 +301,12 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex MX DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -329,6 +345,7 @@ expanded list of hosts = 'test.fail.dns' options = 'bydns' set transport smtp finding IP address for test.fail.dns doing DNS lookup +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns (A) using fakens DNS lookup of test.fail.dns (A) gave NO_RECOVERY returning DNS_FAIL @@ -359,6 +376,7 @@ original list of hosts = '$domain' options = 'bydns' expanded list of hosts = 'test.fail.dns' options = 'bydns' finding IP address for test.fail.dns doing DNS lookup +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns-A: using cached value DNS_FAIL useryz router: defer for userz@test.fail.dns message: host lookup for test.fail.dns did not complete (DNS timeout?) @@ -385,7 +403,9 @@ xyz in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for xyz@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA +ten-1.test.ex MX DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -432,6 +452,7 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@nonexist.test.ex domain = nonexist.test.ex +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex (MX) using fakens DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH @@ -462,7 +483,9 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@nonexist.test.ex domain = nonexist.test.ex +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex-MX: using cached value DNS_NOMATCH +nonexist.test.ex MX DNSSEC lookuphost router declined for abcd@nonexist.test.ex "more" is false: skipping remaining routers no more routers @@ -489,10 +512,12 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex MX DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -531,6 +556,7 @@ expanded list of hosts = 'nonexist.test.ex' options = 'bydns' set transport smtp finding IP address for nonexist.test.ex doing DNS lookup +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex (A) using fakens DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND returning DNS_NOMATCH @@ -561,6 +587,7 @@ original list of hosts = '$domain' options = 'bydns' expanded list of hosts = 'nonexist.test.ex' options = 'bydns' finding IP address for nonexist.test.ex doing DNS lookup +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex-A: using cached value DNS_NOMATCH useryz router: defer for userz@nonexist.test.ex message: lookup of host "nonexist.test.ex" failed in useryz router @@ -587,7 +614,9 @@ xyz in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for xyz@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA +ten-1.test.ex MX DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -624,6 +653,7 @@ srv in "^srv"? yes (matched "^srv") calling srv router srv router called for srv@test.again.dns domain = test.again.dns +test.again.dns in "*"? yes (matched "*") DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN _smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset) @@ -645,6 +675,7 @@ srv in "^srv"? yes (matched "^srv") calling srv router srv router called for srv@test.fail.dns domain = test.fail.dns +test.fail.dns in "*"? yes (matched "*") DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY returning DNS_FAIL @@ -655,6 +686,7 @@ DNS lookup of test.fail.dns (MX) using fakens DNS lookup of test.fail.dns (MX) gave NO_RECOVERY returning DNS_FAIL writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1 +test.fail.dns MX DNSSEC test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns") DNS_FAIL treated as DNS_NODATA (domain in mx_fail_domains) DNS lookup of test.fail.dns (A) using fakens @@ -697,6 +729,7 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@nonexist.example.com domain = nonexist.example.com +nonexist.example.com in "*"? yes (matched "*") DNS lookup of nonexist.example.com (MX) using fakens DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH @@ -738,6 +771,7 @@ checking "condition" "${acl {delay}}"... calling delay router delay router called for userd@nonexist.example.com domain = nonexist.example.com +nonexist.example.com in "*"? yes (matched "*") DNS lookup of nonexist.example.com-MX: cached value DNS_NOMATCH past valid time DNS lookup of nonexist.example.com (MX) using fakens DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND diff --git a/test/stderr/0278 b/test/stderr/0278 index f8219ff8e..91223f29f 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -288,10 +288,12 @@ unknown in "+never_localparts : +n2_localparts : !+local_localparts"? yes (end o calling r2 router r2 router called for unknown@test.ex domain = test.ex +test.ex in "*"? yes (matched "*") DNS lookup of test.ex (MX) using fakens DNS lookup of test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for test.ex-MX-xxxx, ttl 3000 +test.ex MX DNSSEC DNS lookup of test.ex (A) using fakens DNS lookup of test.ex (A) gave NO_DATA returning DNS_NODATA diff --git a/test/stderr/0342 b/test/stderr/0342 index 151a237aa..3f9891c57 100644 --- a/test/stderr/0342 +++ b/test/stderr/0342 @@ -13,10 +13,12 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1 >>> calling dnslookup router +>>> ten-1 in "*"? yes (matched "*") >>> re-routed to x@ten-1.test.ex >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1.test.ex >>> calling dnslookup router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by dnslookup router >>> ----------- end verify ------------ >>> deny: condition test failed in ACL "check_rcpt" diff --git a/test/stderr/0361 b/test/stderr/0361 index 5081d02d7..015140588 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -96,15 +96,18 @@ recurse.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? yes (end of l calling r1 router r1 router called for kilos@recurse.test.ex domain = recurse.test.ex +recurse.test.ex in "*"? yes (matched "*") DNS lookup of recurse.test.ex (MX) using fakens DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3000 r1 router widened recurse.test.ex to recurse.test.ex.test.ex +recurse.test.ex.test.ex in "*"? yes (matched "*") DNS lookup of recurse.test.ex.test.ex (MX) using fakens DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000 +recurse.test.ex.test.ex MX DNSSEC DNS lookup of recurse.test.ex.test.ex (A) using fakens DNS lookup of recurse.test.ex.test.ex (A) succeeded fully qualified name = recurse.test.ex.test.ex diff --git a/test/stderr/0419 b/test/stderr/0419 index 8aba8f1e4..39c797009 100644 --- a/test/stderr/0419 +++ b/test/stderr/0419 @@ -22,6 +22,7 @@ mxt13.test.ex in "! +local_domains"? yes (end of list) calling dnslookup router dnslookup router called for k@mxt13.test.ex domain = mxt13.test.ex +mxt13.test.ex in "*"? yes (matched "*") DNS lookup of mxt13.test.ex (MX) using fakens DNS lookup of mxt13.test.ex (MX) succeeded DNS lookup of other1.test.ex (A) using fakens @@ -46,6 +47,6 @@ domain = mxt13.test.ex routed by dnslookup router envelope to: k@mxt13.test.ex transport: smtp - host other1.test.ex [V4NET.12.4.5] MX=4 + host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0426 b/test/stderr/0426 index dda5191a2..5d0f5b605 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -26,6 +26,7 @@ local_part=x domain=uppercase.test.ex calling r1 router r1 router called for x@uppercase.test.ex domain = uppercase.test.ex +uppercase.test.ex MX DNSSEC local host found for non-MX address fully qualified name = UpperCase.test.ex uppercase.test.ex 127.0.0.1 mx=-1 sort=xx diff --git a/test/stderr/0443 b/test/stderr/0443 index 9b863225c..2911efa80 100644 --- a/test/stderr/0443 +++ b/test/stderr/0443 @@ -12,6 +12,7 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1.test.ex >>> calling r1 router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by r1 router >>> Attempting full verification using callout >>> callout cache: no domain record found for ten-1.test.ex diff --git a/test/stderr/0463 b/test/stderr/0463 index 4dc214435..8d50c41c6 100644 --- a/test/stderr/0463 +++ b/test/stderr/0463 @@ -25,10 +25,12 @@ ten-1 in "!@mx_any"? yes (end of list) calling all router all router called for x@ten-1 domain = ten-1 +ten-1 in "*"? yes (matched "*") DNS lookup of ten-1 (MX) using fakens DNS lookup of ten-1 (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for ten-1-MX-xxxx, ttl 3000 +ten-1 MX DNSSEC DNS lookup of ten-1 (A) using fakens DNS lookup of ten-1 (A) succeeded fully qualified name = ten-1.test.ex @@ -52,10 +54,12 @@ ten-1.test.ex in "!@mx_any"? yes (end of list) calling all router all router called for x@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex MX DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex diff --git a/test/stderr/0469 b/test/stderr/0469 index bf37946ac..9f9e1538e 100644 --- a/test/stderr/0469 +++ b/test/stderr/0469 @@ -18,6 +18,7 @@ local_part=x domain=mxt1c.test.ex calling r1 router r1 router called for x@mxt1c.test.ex domain = mxt1c.test.ex +mxt1c.test.ex in "*"? yes (matched "*") DNS lookup of mxt1c.test.ex (MX) using fakens DNS lookup of mxt1c.test.ex (MX) succeeded DNS lookup of dontqualify (A) using fakens diff --git a/test/stderr/0513 b/test/stderr/0513 index dc2bfa520..60d05a6b3 100644 --- a/test/stderr/0513 +++ b/test/stderr/0513 @@ -16,6 +16,7 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@mxt2.test.ex >>> calling r1 router +>>> mxt2.test.ex in "*"? yes (matched "*") >>> r1 router declined for x@mxt2.test.ex >>> no more routers >>> ----------- end verify ------------ diff --git a/test/stderr/0545 b/test/stderr/0545 index d9987696f..14569c6c3 100644 --- a/test/stderr/0545 +++ b/test/stderr/0545 @@ -18,6 +18,7 @@ local_part=userx domain=alias-eximtesthost calling dns router dns router called for userx@alias-eximtesthost domain = alias-eximtesthost +alias-eximtesthost in "*"? yes (matched "*") DNS lookup of alias-eximtesthost (MX) using fakens DNS lookup of alias-eximtesthost (MX) succeeded CNAME found: change to eximtesthost.test.ex @@ -25,6 +26,7 @@ DNS lookup of eximtesthost.test.ex (MX) using fakens DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000 +alias-eximtesthost MX DNSSEC DNS lookup of alias-eximtesthost (A) using fakens DNS lookup of alias-eximtesthost (A) succeeded CNAME found: change to eximtesthost.test.ex @@ -45,6 +47,7 @@ local_part=userx domain=alias-eximtesthost.test.ex calling dns router dns router called for userx@alias-eximtesthost.test.ex domain = alias-eximtesthost.test.ex +alias-eximtesthost.test.ex in "*"? yes (matched "*") DNS lookup of alias-eximtesthost.test.ex (MX) using fakens DNS lookup of alias-eximtesthost.test.ex (MX) succeeded CNAME found: change to eximtesthost.test.ex @@ -89,6 +92,7 @@ local_part=userx domain=alias-eximtesthost.test.ex calling dns router dns router called for userx@alias-eximtesthost.test.ex domain = alias-eximtesthost.test.ex +alias-eximtesthost.test.ex in "*"? yes (matched "*") DNS lookup of alias-eximtesthost.test.ex (MX) using fakens DNS lookup of alias-eximtesthost.test.ex (MX) succeeded CNAME found: change to eximtesthost.test.ex @@ -96,6 +100,7 @@ DNS lookup of eximtesthost.test.ex (MX) using fakens DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA returning DNS_NODATA writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000 +alias-eximtesthost.test.ex MX DNSSEC DNS lookup of alias-eximtesthost.test.ex (A) using fakens DNS lookup of alias-eximtesthost.test.ex (A) succeeded CNAME found: change to eximtesthost.test.ex diff --git a/test/stderr/0606 b/test/stderr/0606 index ddaacf431..ca6a3b37c 100644 --- a/test/stderr/0606 +++ b/test/stderr/0606 @@ -12,6 +12,7 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing should_log@delay1500.test.ex >>> calling all router +>>> delay1500.test.ex in "*"? yes (matched "*") LOG: Long name lookup for 'delay1500.test.ex': ssss msec >>> local host found for non-MX address >>> routed by all router @@ -32,6 +33,7 @@ LOG: Long name lookup for 'delay1500.test.ex': ssss msec >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing should_not_log@delay500.test.ex >>> calling all router +>>> delay500.test.ex in "*"? yes (matched "*") >>> local host found for non-MX address >>> routed by all router >>> ----------- end verify ------------ diff --git a/test/stderr/3211 b/test/stderr/3211 index f68fdd8f4..2ae0bde59 100644 --- a/test/stderr/3211 +++ b/test/stderr/3211 @@ -15,6 +15,7 @@ >>> calling skipped router >>> skipped router declined for userx@test.again.dns >>> calling temp router +>>> test.again.dns in "*"? yes (matched "*") >>> test.again.dns in dns_again_means_nonexist? no (option unset) >>> temp router: defer for userx@test.again.dns >>> message: host lookup did not complete @@ -36,6 +37,7 @@ LOG: H=[1.2.3.4] F= temporarily rejected RCPT >> routing r1-userx@test.again.dns >>> test.again.dns in "!testdb;fail"? yes (end of list) >>> calling r1 router +>>> test.again.dns in "*"? yes (matched "*") >>> test.again.dns in dns_again_means_nonexist? no (option unset) >>> r1 router: defer for r1-userx@test.again.dns >>> message: host lookup did not complete diff --git a/test/stdout/0147 b/test/stdout/0147 index 32ccd8944..431221c89 100644 --- a/test/stdout/0147 +++ b/test/stdout/0147 @@ -23,7 +23,7 @@ no_check_local_user condition = debug_print = no_disable_logging -dnssec_request_domains = +dnssec_request_domains = * dnssec_require_domains = domains = driver = accept diff --git a/test/stdout/0442 b/test/stdout/0442 index 0b3a5a62a..12c761c90 100644 --- a/test/stdout/0442 +++ b/test/stdout/0442 @@ -8,7 +8,7 @@ no_check_local_user condition = debug_print = no_disable_logging -dnssec_request_domains = +dnssec_request_domains = * dnssec_require_domains = domains = driver = accept diff --git a/test/stdout/0572 b/test/stdout/0572 index b315ec6d3..40c8b3529 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -41,7 +41,7 @@ data_timeout = 5m delay_after_cutoff dns_qualify_single no_dns_search_parents -dnssec_request_domains = +dnssec_request_domains = * dnssec_require_domains = dscp = fallback_hosts = -- 2.30.2