DKIM: tighten up parsing for DKIM DNS and header records. Bug 3056

[exim.git] / test / stderr / 0060

diff --git a/test/stderr/0060 b/test/stderr/0060
index 7060ca8fe3e9cc05c1e84d8625254a4bd020b9da..39ea365ce1f81290f4017db7f8d43f29d2c68453 100644 (file)
--- a/test/stderr/0060
+++ b/test/stderr/0060
@@ -6,35 +6,59 @@
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   list element: !V4NET.255.0.2
+>>>   list element: !TESTSUITE/aux-var/0060.d1
+>>>   list element: ! TESTSUITE/aux-var/0060.d2
+>>>   list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? yes (matched "ten-1.test.ex")
->>> host in "+relay_hosts"? yes (matched "+relay_hosts")
+>>>   host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? yes (matched "ten-1.test.ex")
+>>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] 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)
@@ -43,35 +67,60 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smt
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   list element: !V4NET.255.0.2
+>>>   list element: !TESTSUITE/aux-var/0060.d1
+>>>   list element: ! TESTSUITE/aux-var/0060.d2
+>>>   list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>>   list element: ten-5-6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-5-6.test.ex address=V4NET.0.0.5
 >>>   name=ten-5-6.test.ex address=V4NET.0.0.6
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (end of list)
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (end of list)
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
@@ -79,7 +128,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] 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)
@@ -88,39 +137,64 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smt
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   list element: !V4NET.255.0.2
+>>>   list element: !TESTSUITE/aux-var/0060.d1
+>>>   list element: ! TESTSUITE/aux-var/0060.d2
+>>>   list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>>   list element: ten-5-6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-5-6.test.ex address=V4NET.0.0.5
 >>>   name=ten-5-6.test.ex address=V4NET.0.0.6
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? yes (matched "ten-5-6.test.ex")
->>> host in "+relay_hosts"? yes (matched "+relay_hosts")
+>>>   host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? yes (matched "ten-5-6.test.ex")
+>>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] P=smtp S=sss
+LOG: 10HmaZ-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] 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)
@@ -129,39 +203,64 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] P=smt
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   list element: !V4NET.255.0.2
+>>>   list element: !TESTSUITE/aux-var/0060.d1
+>>>   list element: ! TESTSUITE/aux-var/0060.d2
+>>>   list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>>   list element: ten-5-6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-5-6.test.ex address=V4NET.0.0.5
 >>>   name=ten-5-6.test.ex address=V4NET.0.0.6
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? yes (matched "ten-5-6.test.ex")
->>> host in "+relay_hosts"? yes (matched "+relay_hosts")
+>>>   host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? yes (matched "ten-5-6.test.ex")
+>>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smtp S=sss
+LOG: 10HmbA-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] 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)
@@ -170,28 +269,48 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smt
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "! V4NET.255.0.1")
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "! V4NET.255.0.1")
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
@@ -199,7 +318,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smt
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=smtp S=sss
+LOG: 10HmbB-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] 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)
@@ -208,28 +327,49 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=s
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "!V4NET.255.0.2")
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   list element: !V4NET.255.0.2
+>>>   host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "!V4NET.255.0.2")
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
@@ -237,7 +377,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=s
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=smtp S=sss
+LOG: 10HmbC-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] 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)
@@ -246,28 +386,50 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=s
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "V4NET.255.0.3" in TESTSUITE/aux-var/0060.d1)
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   list element: !V4NET.255.0.2
+>>>   list element: !TESTSUITE/aux-var/0060.d1
+>>>   host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "V4NET.255.0.3" in TESTSUITE/aux-var/0060.d1)
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
@@ -275,7 +437,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=s
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=smtp S=sss
+LOG: 10HmbD-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] 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)
@@ -284,28 +446,51 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=s
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  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 "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +relay_domains
->>> anotherhost.example.com in "test.ex"? no (end of list)
+>>> anotherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  anotherhost.example.com in "test.ex"?
+>>>   list element: test.ex
+>>>  anotherhost.example.com in "test.ex"? no (end of list)
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = +relay_hosts
->>> host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "V4NET.255.0.4" in TESTSUITE/aux-var/0060.d2)
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"?
+>>>   list element: ! V4NET.255.0.1
+>>>   list element: !V4NET.255.0.2
+>>>   list element: !TESTSUITE/aux-var/0060.d1
+>>>   list element: ! TESTSUITE/aux-var/0060.d2
+>>>   host in "! V4NET.255.0.1 : !V4NET.255.0.2 : !TESTSUITE/aux-var/0060.d1 : ! TESTSUITE/aux-var/0060.d2 : ten-1.test.ex : ten-5-6.test.ex"? no (matched "V4NET.255.0.4" in TESTSUITE/aux-var/0060.d2)
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
@@ -313,4 +498,4 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=s
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.4] P=smtp S=sss
+LOG: 10HmbE-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.4] P=smtp S=sss