Testsuite: output changes resulting

[exim.git] / test / stderr / 0139

diff --git a/test/stderr/0139 b/test/stderr/0139
index 66331324656e640ae4ebe60ccb3d8f2ca3f937ed..a329e1ce515a07f20d3319c90a306b7a271c4051 100644 (file)
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -6,6 +6,7 @@
 >>> 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 38)
@@ -69,7 +70,9 @@
 >>> 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 "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
@@ -81,15 +84,21 @@
 >>> 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 "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? 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 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
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "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"
@@ -125,12 +134,16 @@
 >>> deny: condition test failed in ACL "check_recipient"
 >>> 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
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "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)
@@ -139,6 +152,7 @@ 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 38)
@@ -202,6 +216,7 @@ 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 38)
@@ -248,6 +263,7 @@ 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 38)
@@ -292,6 +308,9 @@ 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 22)
@@ -318,7 +337,9 @@ 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 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -394,6 +415,8 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.2]
@@ -405,7 +428,9 @@ 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 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -481,6 +506,8 @@ LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.100]
@@ -492,7 +519,9 @@ 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 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -568,6 +597,8 @@ LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.101]
@@ -579,7 +610,9 @@ 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 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -655,6 +688,8 @@ LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.102]
@@ -666,7 +701,9 @@ 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 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -742,6 +779,8 @@ LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.103]
@@ -753,7 +792,9 @@ 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 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -830,6 +871,8 @@ LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.104]
@@ -841,7 +884,9 @@ 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 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -918,6 +963,8 @@ LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.105]