Fix 2-phase, in-order queue run delivery order

[exim.git] / test / stderr / 0023

diff --git a/test/stderr/0023 b/test/stderr/0023
index 7230d855745981a2099835f3f9b70c3b93e72c77..78783ded61cfee2679156eee5d32ba4bf6c0fbcb 100644 (file)
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -6,8 +6,6 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -39,9 +37,12 @@
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>>   message: $domain gets refused
 >>> check domains = !refuse.test.ex
@@ -77,25 +78,32 @@
 >>> check domains = +local_domains
 >>> z in "+local_domains"?
 >>>  list element: +local_domains
->>>  z in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: *.test.ex
->>>  z in "test.ex : *.test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    z in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: *.test.ex
+>>>    z in "test.ex : *.test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> z in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> processing "accept" (TESTSUITE/test-config 60)
 >>> check domains = +relay_domains
 >>> z in "+relay_domains"?
 >>>  list element: +relay_domains
->>>  z in "relay.test.ex"?
->>>   list element: relay.test.ex
->>>  z in "relay.test.ex"? no (end of list)
+>>>   start sublist relay_domains
+>>>    z in "relay.test.ex"?
+>>>    ╎list element: relay.test.ex
+>>>    z in "relay.test.ex"? no (end of list)
+>>>   end sublist relay_domains
 >>> z in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> processing "accept" (TESTSUITE/test-config 61)
 >>> check domains = +relay_domains
 >>> z in "+relay_domains"?
 >>>  list element: +relay_domains
+>>>   start sublist relay_domains
+>>>  cached no match for +relay_domains
+>>>  cached lookup data = NULL
 >>> z in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": implicit DENY
@@ -127,9 +135,12 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>>   message: $domain gets refused
 >>> check domains = !refuse.test.ex
@@ -165,9 +176,12 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>>   message: $domain gets refused
 >>> check domains = !refuse.test.ex
@@ -203,10 +217,13 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> check domains = +local_domains
 >>> relay.test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  relay.test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: *.test.ex
->>>   relay.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   start sublist local_domains
+>>>    relay.test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: *.test.ex
+>>>    ╎relay.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'relay.test.ex' value '*.test.ex'
 >>>  relay.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>>   message: $domain gets refused
 >>> check domains = !refuse.test.ex
@@ -267,10 +284,13 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITL
 >>> check domains = +local_domains
 >>> refuse.test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  refuse.test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: *.test.ex
->>>   refuse.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   start sublist local_domains
+>>>    refuse.test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: *.test.ex
+>>>    ╎refuse.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'refuse.test.ex' value '*.test.ex'
 >>>  refuse.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>>   message: $domain gets refused
 >>> check domains = !refuse.test.ex
@@ -313,8 +333,6 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -375,8 +393,6 @@ LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -386,9 +402,11 @@ LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> check hosts = +ok9_hosts
 >>> host in "+ok9_hosts"?
 >>>  list element: +ok9_hosts
->>>  host in "9.9.9.9"?
->>>   list element: 9.9.9.9
->>>   host in "9.9.9.9"? yes (matched "9.9.9.9")
+>>>   start sublist ok9_hosts
+>>>    host in "9.9.9.9"?
+>>>    ╎list element: 9.9.9.9
+>>>    ╎host in "9.9.9.9"? yes (matched "9.9.9.9")
+>>>   end sublist ok9_hosts
 >>>  host in "+ok9_hosts"? yes (matched "+ok9_hosts")
 >>> accept: condition test succeeded in ACL "acl_9_9_9"
 >>> end of ACL "acl_9_9_9": ACCEPT
@@ -397,6 +415,9 @@ LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> check hosts = +ok9_hosts
 >>> host in "+ok9_hosts"?
 >>>  list element: +ok9_hosts
+>>>   start sublist ok9_hosts
+>>>  cached yes match for +ok9_hosts
+>>>  cached lookup data = NULL
 >>>  host in "+ok9_hosts"? yes (matched "+ok9_hosts" - cached)
 >>> accept: condition test succeeded in ACL "acl_9_9_9"
 >>> end of ACL "acl_9_9_9": ACCEPT
@@ -408,8 +429,6 @@ LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -419,9 +438,11 @@ LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> check hosts = +ok9_hosts
 >>> host in "+ok9_hosts"?
 >>>  list element: +ok9_hosts
->>>  host in "9.9.9.9"?
->>>   list element: 9.9.9.9
->>>  host in "9.9.9.9"? no (end of list)
+>>>   start sublist ok9_hosts
+>>>    host in "9.9.9.9"?
+>>>    ╎list element: 9.9.9.9
+>>>    host in "9.9.9.9"? no (end of list)
+>>>   end sublist ok9_hosts
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny" (TESTSUITE/test-config 92)
@@ -438,6 +459,9 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host
 >>> check hosts = +ok9_hosts
 >>> host in "+ok9_hosts"?
 >>>  list element: +ok9_hosts
+>>>   start sublist ok9_hosts
+>>>  cached no match for +ok9_hosts
+>>>  cached lookup data = NULL
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny" (TESTSUITE/test-config 92)
@@ -457,8 +481,6 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -468,9 +490,11 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> check hosts = +ok9_hosts
 >>> host in "+ok9_hosts"?
 >>>  list element: +ok9_hosts
->>>  host in "9.9.9.9"?
->>>   list element: 9.9.9.9
->>>  host in "9.9.9.9"? no (end of list)
+>>>   start sublist ok9_hosts
+>>>    host in "9.9.9.9"?
+>>>    ╎list element: 9.9.9.9
+>>>    host in "9.9.9.9"? no (end of list)
+>>>   end sublist ok9_hosts
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny" (TESTSUITE/test-config 92)
@@ -492,6 +516,9 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> check hosts = +ok9_hosts
 >>> host in "+ok9_hosts"?
 >>>  list element: +ok9_hosts
+>>>   start sublist ok9_hosts
+>>>  cached no match for +ok9_hosts
+>>>  cached lookup data = NULL
 >>> host in "+ok9_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "acl_9_9_9"
 >>> processing "deny" (TESTSUITE/test-config 92)
@@ -516,8 +543,6 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -532,9 +557,11 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>>   list element: domain2
 >>>  y in "domain2"? no (end of list)
 >>>  list element: +ok_senders
->>>  x@y in "ok@ok.ok"?
->>>   list element: ok@ok.ok
->>>  x@y in "ok@ok.ok"? no (end of list)
+>>>   start sublist ok_senders
+>>>    x@y in "ok@ok.ok"?
+>>>    ╎list element: ok@ok.ok
+>>>    x@y in "ok@ok.ok"? no (end of list)
+>>>   end sublist ok_senders
 >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY
@@ -549,6 +576,9 @@ LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <x@y>
 >>>   list element: domain2
 >>>  y in "domain2"? no (end of list)
 >>>  list element: +ok_senders
+>>>   start sublist ok_senders
+>>>  cached no match for +ok_senders
+>>>  cached lookup data = NULL
 >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY
@@ -577,9 +607,11 @@ LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <y@x>
 >>>   list element: domain2
 >>>  domain1 in "domain2"? no (end of list)
 >>>  list element: +ok_senders
->>>  user2@domain1 in "ok@ok.ok"?
->>>   list element: ok@ok.ok
->>>  user2@domain1 in "ok@ok.ok"? no (end of list)
+>>>   start sublist ok_senders
+>>>    user2@domain1 in "ok@ok.ok"?
+>>>    ╎list element: ok@ok.ok
+>>>    user2@domain1 in "ok@ok.ok"? no (end of list)
+>>>   end sublist ok_senders
 >>> user2@domain1 in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY
@@ -609,12 +641,15 @@ LOG: H=(test) [5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
 >>>   list element: domain2
 >>>  ok.ok in "domain2"? no (end of list)
 >>>  list element: +ok_senders
->>>  ok@ok.ok in "ok@ok.ok"?
->>>   list element: ok@ok.ok
->>>   ok.ok in "ok.ok"?
->>>    list element: ok.ok
->>>    ok.ok in "ok.ok"? yes (matched "ok.ok")
->>>   ok@ok.ok in "ok@ok.ok"? yes (matched "ok@ok.ok")
+>>>   start sublist ok_senders
+>>>    ok@ok.ok in "ok@ok.ok"?
+>>>    ╎list element: ok@ok.ok
+>>>    ╎ok.ok in "ok.ok"?
+>>>    ╎ list element: ok.ok
+>>>    ╎ ok.ok in "ok.ok"? yes (matched "ok.ok")
+>>>    ╎ok@ok.ok in "ok@ok.ok"? yes (matched "ok@ok.ok")
+>>>   end sublist ok_senders
+>>>  data from lookup saved for cache for +ok_senders: key 'ok@ok.ok' value 'ok@ok.ok'
 >>>  ok@ok.ok in "user1@domain1 : domain2 : +ok_senders"? yes (matched "+ok_senders")
 >>> accept: condition test succeeded in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": ACCEPT
@@ -628,6 +663,9 @@ LOG: H=(test) [5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
 >>>   list element: domain2
 >>>  ok.ok in "domain2"? no (end of list)
 >>>  list element: +ok_senders
+>>>   start sublist ok_senders
+>>>  cached yes match for +ok_senders
+>>>  cached lookup data = ok@ok.ok
 >>>  ok@ok.ok in "user1@domain1 : domain2 : +ok_senders"? yes (matched "+ok_senders" - cached)
 >>> accept: condition test succeeded in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": ACCEPT
@@ -639,8 +677,6 @@ LOG: H=(test) [5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -675,8 +711,6 @@ LOG: H=(test) [5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -726,8 +760,6 @@ LOG: H=(test) [5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -760,8 +792,6 @@ LOG: H=(test) [5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -859,8 +889,6 @@ LOG: H=(test) [8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -926,8 +954,6 @@ LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x2@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -965,8 +991,6 @@ LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.e
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1006,8 +1030,6 @@ LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.e
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1018,16 +1040,16 @@ LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.e
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y
->>> x in "^ok"?
+>>> x in local_parts?
 >>>  list element: ^ok
->>> x in "^ok"? no (end of list)
->>> x in "^userx : ^cond-"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> x in "^userx : ^cond-"? no (end of list)
->>> x in "fail"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: fail
->>> x in "fail"? no (end of list)
+>>> x in local_parts? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_20_20_20"
@@ -1050,8 +1072,6 @@ LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1062,12 +1082,12 @@ LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
->>> userx in "^ok"?
+>>> userx in local_parts?
 >>>  list element: ^ok
->>> userx in "^ok"? no (end of list)
->>> userx in "^userx : ^cond-"?
+>>> userx in local_parts? no (end of list)
+>>> userx in local_parts?
 >>>  list element: ^userx
->>>  userx in "^userx : ^cond-"? yes (matched "^userx")
+>>>  userx in local_parts? yes (matched "^userx")
 >>> calling r1 router
 >>> routed by r1 router
 >>> ----------- end verify ------------
@@ -1075,16 +1095,16 @@ LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x1@y
->>> x1 in "^ok"?
+>>> x1 in local_parts?
 >>>  list element: ^ok
->>> x1 in "^ok"? no (end of list)
->>> x1 in "^userx : ^cond-"?
+>>> x1 in local_parts? no (end of list)
+>>> x1 in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> x1 in "^userx : ^cond-"? no (end of list)
->>> x1 in "fail"?
+>>> x1 in local_parts? no (end of list)
+>>> x1 in local_parts?
 >>>  list element: fail
->>> x1 in "fail"? no (end of list)
+>>> x1 in local_parts? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_20_20_20"
@@ -1099,12 +1119,12 @@ LOG: H=(test) [20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable addres
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
->>> userx in "^ok"?
+>>> userx in local_parts?
 >>>  list element: ^ok
->>> userx in "^ok"? no (end of list)
->>> userx in "^userx : ^cond-"?
+>>> userx in local_parts? no (end of list)
+>>> userx in local_parts?
 >>>  list element: ^userx
->>>  userx in "^userx : ^cond-"? yes (matched "^userx")
+>>>  userx in local_parts? yes (matched "^userx")
 >>> calling r1 router
 >>> routed by r1 router
 >>> ----------- end verify ------------
@@ -1118,8 +1138,6 @@ LOG: H=(test) [20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable addres
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1129,28 +1147,28 @@ LOG: H=(test) [20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable addres
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
->>> userx in "^ok"?
+>>> userx in local_parts?
 >>>  list element: ^ok
->>> userx in "^ok"? no (end of list)
->>> userx in "^userx : ^cond-"?
+>>> userx in local_parts? no (end of list)
+>>> userx in local_parts?
 >>>  list element: ^userx
->>>  userx in "^userx : ^cond-"? yes (matched "^userx")
+>>>  userx in local_parts? yes (matched "^userx")
 >>> calling r1 router
 >>> routed by r1 router
 >>> ----------- end verify ------------
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x1@y
->>> x1 in "^ok"?
+>>> x1 in local_parts?
 >>>  list element: ^ok
->>> x1 in "^ok"? no (end of list)
->>> x1 in "^userx : ^cond-"?
+>>> x1 in local_parts? no (end of list)
+>>> x1 in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> x1 in "^userx : ^cond-"? no (end of list)
->>> x1 in "fail"?
+>>> x1 in local_parts? no (end of list)
+>>> x1 in local_parts?
 >>>  list element: fail
->>> x1 in "fail"? no (end of list)
+>>> x1 in local_parts? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
@@ -1163,12 +1181,12 @@ LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable addres
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
->>> userx in "^ok"?
+>>> userx in local_parts?
 >>>  list element: ^ok
->>> userx in "^ok"? no (end of list)
->>> userx in "^userx : ^cond-"?
+>>> userx in local_parts? no (end of list)
+>>> userx in local_parts?
 >>>  list element: ^userx
->>>  userx in "^userx : ^cond-"? yes (matched "^userx")
+>>>  userx in local_parts? yes (matched "^userx")
 >>> calling r1 router
 >>> routed by r1 router
 >>> ----------- end verify ------------
@@ -1181,16 +1199,16 @@ LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable addres
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@y
->>> fail in "^ok"?
+>>> fail in local_parts?
 >>>  list element: ^ok
->>> fail in "^ok"? no (end of list)
->>> fail in "^userx : ^cond-"?
+>>> fail in local_parts? no (end of list)
+>>> fail in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> fail in "^userx : ^cond-"? no (end of list)
->>> fail in "fail"?
+>>> fail in local_parts? no (end of list)
+>>> fail in local_parts?
 >>>  list element: fail
->>>  fail in "fail"? yes (matched "fail")
+>>>  fail in local_parts? yes (matched "fail")
 >>> calling r2 router
 >>> r2 router forced address failure
 >>> ----------- end verify ------------
@@ -1202,16 +1220,16 @@ LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail m
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y
->>> x in "^ok"?
+>>> x in local_parts?
 >>>  list element: ^ok
->>> x in "^ok"? no (end of list)
->>> x in "^userx : ^cond-"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> x in "^userx : ^cond-"? no (end of list)
->>> x in "fail"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: fail
->>> x in "fail"? no (end of list)
+>>> x in local_parts? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
@@ -1233,16 +1251,16 @@ LOG: H=(test) [21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@y
->>> fail in "^ok"?
+>>> fail in local_parts?
 >>>  list element: ^ok
->>> fail in "^ok"? no (end of list)
->>> fail in "^userx : ^cond-"?
+>>> fail in local_parts? no (end of list)
+>>> fail in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> fail in "^userx : ^cond-"? no (end of list)
->>> fail in "fail"?
+>>> fail in local_parts? no (end of list)
+>>> fail in local_parts?
 >>>  list element: fail
->>>  fail in "fail"? yes (matched "fail")
+>>>  fail in local_parts? yes (matched "fail")
 >>> calling r2 router
 >>> r2 router forced address failure
 >>> ----------- end verify ------------
@@ -1258,8 +1276,6 @@ LOG: H=(test) [21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1292,8 +1308,6 @@ LOG: H=(test) [22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1308,16 +1322,16 @@ LOG: H=(test) [22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y
->>> x in "^ok"?
+>>> x in local_parts?
 >>>  list element: ^ok
->>> x in "^ok"? no (end of list)
->>> x in "^userx : ^cond-"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> x in "^userx : ^cond-"? no (end of list)
->>> x in "fail"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: fail
->>> x in "fail"? no (end of list)
+>>> x in local_parts? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "acl_23_23_23"
@@ -1334,12 +1348,12 @@ LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@y
->>> userx in "^ok"?
+>>> userx in local_parts?
 >>>  list element: ^ok
->>> userx in "^ok"? no (end of list)
->>> userx in "^userx : ^cond-"?
+>>> userx in local_parts? no (end of list)
+>>> userx in local_parts?
 >>>  list element: ^userx
->>>  userx in "^userx : ^cond-"? yes (matched "^userx")
+>>>  userx in local_parts? yes (matched "^userx")
 >>> calling r1 router
 >>> routed by r1 router
 >>> ----------- end verify ------------
@@ -1355,8 +1369,6 @@ LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1379,8 +1391,6 @@ LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1400,8 +1410,6 @@ LOG: H=(test) [24.24.24.24] F=<x@y> rejected RCPT <userx@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1424,8 +1432,6 @@ LOG: H=(test) [25.25.25.25] F=<x@y> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1475,8 +1481,6 @@ LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have o
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1497,8 +1501,6 @@ LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have o
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1541,8 +1543,6 @@ LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1554,8 +1554,16 @@ LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
 >>> looking up host name for V4NET.0.0.3
 >>> IP address lookup yielded "ten-3.test.ex"
 >>>   alias "ten-3-alias.test.ex"
+>>>  check dnssec require list
+>>>   ten-3.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   ten-3.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for ten-3.test.ex
 >>>   V4NET.0.0.3 OK
+>>>  check dnssec require list
+>>>   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for ten-3-alias.test.ex
 >>>   V4NET.0.0.3 OK
 >>> require: condition test succeeded in ACL "acl_V4NET_0_0"
@@ -1570,8 +1578,6 @@ LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1593,8 +1599,6 @@ LOG: H=(test) [V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for re
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1611,7 +1615,11 @@ LOG: H=(test) [V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for re
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.99.99.96
 >>> IP address lookup yielded "x.test.again.dns"
->>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  check dnssec require list
+>>>   x.test.again.dns not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   x.test.again.dns not in empty list (option unset? cannot trace name)
+>>>  x.test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> temporary error for host name lookup
 >>> accept: condition test deferred in ACL "acl_V4NET_99_99"
 LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check
@@ -1623,8 +1631,6 @@ LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1639,7 +1645,11 @@ LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.99.99.96
 >>> IP address lookup yielded "x.test.again.dns"
->>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  check dnssec require list
+>>>   x.test.again.dns not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   x.test.again.dns not in empty list (option unset? cannot trace name)
+>>>  x.test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> temporary error for host name lookup
 >>> accept: condition test succeeded in ACL "acl_V4NET_99_99"
 >>> end of ACL "acl_V4NET_99_99": ACCEPT
@@ -1651,8 +1661,6 @@ LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1690,8 +1698,6 @@ LOG: H=(test) [29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1748,8 +1754,6 @@ LOG: H=(test) [30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1772,8 +1776,6 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1784,16 +1786,16 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
 >>> check verify = sender/no_details
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@y
->>> x in "^ok"?
+>>> x in local_parts?
 >>>  list element: ^ok
->>> x in "^ok"? no (end of list)
->>> x in "^userx : ^cond-"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: ^userx
 >>>  list element: ^cond-
->>> x in "^userx : ^cond-"? no (end of list)
->>> x in "fail"?
+>>> x in local_parts? no (end of list)
+>>> x in local_parts?
 >>>  list element: fail
->>> x in "fail"? no (end of list)
+>>> x in local_parts? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_33_33_33"
@@ -1815,8 +1817,6 @@ LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -1864,8 +1864,6 @@ LOG: H=(test) [44.44.44.1] Warning: ACL "warn" statement skipped: condition test
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]