Hintsdb: USE_SQLITE build option

[exim.git] / test / stderr / 0139

diff --git a/test/stderr/0139 b/test/stderr/0139
index eb73157706ea0588e6602605792539bb5753d27a..9adf879de73772819fc5673d4cd0b91eb2170f65 100644 (file)
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -6,8 +6,10 @@
 >>> 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 hosts_require_helo?
+>>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 14.12.11.V4NET.rbl4.test.ex
@@ -15,32 +17,32 @@
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)
 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3
@@ -49,7 +51,7 @@
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3
@@ -58,7 +60,7 @@
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.3
 >>> deny: condition test failed in ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 52)
+>>> processing "require" (TESTSUITE/test-config 53)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing postmaster@exim.test.ex
@@ -68,31 +70,42 @@
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> userx in "userx"? yes (matched "userx")
+>>> userx in local_parts?
+>>>  list element: userx
+>>>  userx in local_parts? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 53)
+>>> processing "deny" (TESTSUITE/test-config 54)
 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> userx in "userx"? yes (matched "userx")
+>>> userx in local_parts?
+>>>  list element: userx
+>>>  userx in local_parts? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 55)
+>>> processing "accept" (TESTSUITE/test-config 56)
 >>> check domains = +local_domains
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> exim.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    exim.test.ex in "exim.test.ex"?
+>>>    ╎list element: exim.test.ex
+>>>    ╎exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'exim.test.ex' value 'exim.test.ex'
+>>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)
 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3
@@ -100,7 +113,7 @@
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3
@@ -109,11 +122,11 @@
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.3
 >>> deny: condition test failed in ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 52)
+>>> processing "require" (TESTSUITE/test-config 53)
 >>> check verify = sender
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 53)
+>>> processing "deny" (TESTSUITE/test-config 54)
 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -122,14 +135,21 @@
 >>> routed by system_aliases router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 55)
+>>> processing "accept" (TESTSUITE/test-config 56)
 >>> check domains = +local_domains
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> exim.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    exim.test.ex in "exim.test.ex"?
+>>>    ╎list element: exim.test.ex
+>>>    ╎exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'exim.test.ex' value 'exim.test.ex'
+>>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
+LOG: 10HmaY-000000005vi-0000 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -138,8 +158,10 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> 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 hosts_require_helo?
+>>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 15.12.11.V4NET.rbl4.test.ex
@@ -147,32 +169,32 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)
 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3
@@ -182,7 +204,7 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for =127.0.0.3
 >>> warn: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3
@@ -200,8 +222,10 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> 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 hosts_require_helo?
+>>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 20.12.11.V4NET.rbl4.test.ex
@@ -209,7 +233,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 20.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.6)
 >>> => that means V4NET.11.12.20 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
@@ -217,7 +241,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was no match for &127.0.0.3
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
@@ -226,7 +250,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> check add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
 >>>                  = DNSlist: rbl4.test.ex  V4NET.11.12.20
 >>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
@@ -234,7 +258,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.128
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
@@ -245,8 +269,10 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> 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 hosts_require_helo?
+>>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 21.12.11.V4NET.rbl4.test.ex
@@ -254,14 +280,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
 >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
 >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
@@ -269,7 +295,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for &0.0.0.7
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
@@ -277,7 +303,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.128
 >>> warn: condition test failed in ACL "check_mail"
->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
@@ -288,9 +314,12 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> 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)
+>>> a.b in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b in helo_lookup_domains? no (end of list)
 >>> using ACL "check_helo"
->>> processing "warn" (TESTSUITE/test-config 21)
+>>> processing "warn" (TESTSUITE/test-config 22)
 >>> check dnslists = rbl2.test.ex!=127.0.0.3 : rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl2.test.ex!=127.0.0.3
 >>> new DNS lookup for 15.12.11.V4NET.rbl2.test.ex
@@ -303,7 +332,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 15.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.3)
 >>> => that means V4NET.11.12.15 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_helo"
->>> processing "accept" (TESTSUITE/test-config 22)
+>>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in ACL "check_helo"
 >>> end of ACL "check_helo": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
@@ -314,9 +343,11 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 2.13.13.V4NET.rbl.test.ex
@@ -324,7 +355,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -332,14 +363,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -347,28 +378,28 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
@@ -376,21 +407,23 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there were no IP addresses that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"? no (end of list)
+>>> a in local_parts?
+>>>  list element: userx
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -401,9 +434,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 100.13.13.V4NET.rbl.test.ex
@@ -412,21 +447,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -434,7 +469,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
@@ -442,42 +477,44 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"? no (end of list)
+>>> a in local_parts?
+>>>  list element: userx
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -488,9 +525,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 101.13.13.V4NET.rbl.test.ex
@@ -499,21 +538,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -521,7 +560,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
@@ -529,42 +568,44 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"? no (end of list)
+>>> a in local_parts?
+>>>  list element: userx
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -575,9 +616,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 102.13.13.V4NET.rbl.test.ex
@@ -586,21 +629,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -608,7 +651,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
@@ -616,42 +659,44 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"? no (end of list)
+>>> a in local_parts?
+>>>  list element: userx
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -662,9 +707,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 103.13.13.V4NET.rbl.test.ex
@@ -673,21 +720,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -695,7 +742,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
@@ -703,42 +750,44 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"? no (end of list)
+>>> a in local_parts?
+>>>  list element: userx
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -749,9 +798,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 104.13.13.V4NET.rbl.test.ex
@@ -760,21 +811,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -782,7 +833,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
@@ -790,28 +841,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
@@ -819,14 +870,16 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"? no (end of list)
+>>> a in local_parts?
+>>>  list element: userx
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> host in hosts_connection_nolog? no (option unset)
@@ -837,9 +890,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> 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 smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 105.13.13.V4NET.rbl.test.ex
@@ -848,21 +903,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
@@ -870,7 +925,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
@@ -878,28 +933,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
@@ -907,13 +962,15 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> a in "userx"? no (end of list)
+>>> a in local_parts?
+>>>  list element: userx
+>>> a in local_parts? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.105]