Testsuite: output changes resulting

[exim.git] / test / stderr / 4031

diff --git a/test/stderr/4031 b/test/stderr/4031
index b0d6a4aaf5003cf9ce8e4ff2ea2226a950e239bc..046df300a72ed22afc649f12b078f1484c7afea1 100644 (file)
--- a/test/stderr/4031
+++ b/test/stderr/4031
@@ -7,9 +7,13 @@
 >>> 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)
+>>>  list element: ip4.ip4.ip4.ip4
+>>> clientname in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> clientname in helo_lookup_domains? no (end of list)
 >>> using ACL "r_acl"
->>> processing "accept" (TESTSUITE/test-config 22)
+>>> processing ACL r_acl "accept" (TESTSUITE/test-config 22)
 >>> check logwrite = proxy session: $proxy_session
 >>>                = proxy session: no
 LOG: proxy session: no
@@ -25,10 +29,10 @@ LOG: proxy external []:0
 >>> check logwrite = remote         [$sender_host_address]:$sender_host_port
 >>>                = remote         [127.0.0.2]:1111
 LOG: remote         [127.0.0.2]:1111
->>> accept: condition test succeeded in ACL "r_acl"
->>> end of ACL "r_acl": ACCEPT
+>>> accept: condition test succeeded in ACL r_acl
+>>> end of ACL r_acl: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaX-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss
 ### protocol v1 receive
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -38,11 +42,15 @@ LOG: 10HmaX-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2] 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)
+>>>  list element: ip4.ip4.ip4.ip4
 >>> looking up host name for 127.0.0.2
 LOG: no host name found for IP address 127.0.0.2
+>>> clientname in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> clientname in helo_lookup_domains? no (end of list)
 >>> using ACL "r_acl"
->>> processing "accept" (TESTSUITE/test-config 22)
+>>> processing ACL r_acl "accept" (TESTSUITE/test-config 22)
 >>> check logwrite = proxy session: $proxy_session
 >>>                = proxy session: yes
 LOG: proxy session: yes
@@ -58,10 +66,10 @@ LOG: proxy external [127.42.42.42]:1112
 >>> check logwrite = remote         [$sender_host_address]:$sender_host_port
 >>>                = remote         [127.0.0.2]:1113
 LOG: remote         [127.0.0.2]:1113
->>> accept: condition test succeeded in ACL "r_acl"
->>> end of ACL "r_acl": ACCEPT
+>>> accept: condition test succeeded in ACL r_acl
+>>> end of ACL r_acl: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaY-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss
+LOG: 10HmaY-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss
 ### protocol v2 receive
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -71,11 +79,15 @@ LOG: 10HmaY-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip
 >>> 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)
+>>>  list element: ip4.ip4.ip4.ip4
 >>> looking up host name for 127.0.0.2
 LOG: no host name found for IP address 127.0.0.2
+>>> clientname in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> clientname in helo_lookup_domains? no (end of list)
 >>> using ACL "r_acl"
->>> processing "accept" (TESTSUITE/test-config 22)
+>>> processing ACL r_acl "accept" (TESTSUITE/test-config 22)
 >>> check logwrite = proxy session: $proxy_session
 >>>                = proxy session: yes
 LOG: proxy session: yes
@@ -91,10 +103,10 @@ LOG: proxy external [127.42.42.42]:1114
 >>> check logwrite = remote         [$sender_host_address]:$sender_host_port
 >>>                = remote         [127.0.0.2]:1115
 LOG: remote         [127.0.0.2]:1115
->>> accept: condition test succeeded in ACL "r_acl"
->>> end of ACL "r_acl": ACCEPT
+>>> accept: condition test succeeded in ACL r_acl
+>>> end of ACL r_acl: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaZ-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss
+LOG: 10HmaZ-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss
 ### proxy timeout
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -104,6 +116,7 @@ LOG: 10HmaZ-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip
 >>> 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)
+>>>  list element: ip4.ip4.ip4.ip4
 
 ******** SERVER ********
 ### non-prox plain receive