X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..67cc3ad2fe09fa6197c54a18fa9eb8f1375a87ec:/test/stderr/0121?ds=sidebyside diff --git a/test/stderr/0121 b/test/stderr/0121 index 96adb7f2f..8e6e33d1c 100644 --- a/test/stderr/0121 +++ b/test/stderr/0121 @@ -6,8 +6,6 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -132,7 +130,7 @@ LOG: H=(test) [127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT >> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F= rejected after DATA: there is no valid sender in any header line +LOG: 10HmaX-000000005vi-0000 H=(test) [127.0.0.1] F= rejected after DATA: there is no valid sender in any header line >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -171,7 +169,7 @@ LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F= rejected after DATA >>> verifying From: header address <> >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaY-0005vi-00 H=(test) [127.0.0.1] F= rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>" +LOG: 10HmaY-000000005vi-0000 H=(test) [127.0.0.1] F= rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>" >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -244,7 +242,7 @@ LOG: H=(test) [127.0.0.1] F= temporarily rejected RCPT >> defer router: defer for defer@test.ex >>> message: forced defer >>> require: condition test deferred in ACL "check_message" -LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F= temporarily rejected after DATA: all attempts to verify a sender in a header line deferred +LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F= temporarily rejected after DATA: all attempts to verify a sender in a header line deferred >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -253,21 +251,16 @@ LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F= temporarily rejecte >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> host in limits_advertise_hosts? ->>> list element: !* >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? >>> list element: * >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -275,51 +268,39 @@ LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F= temporarily rejecte >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> host in limits_advertise_hosts? ->>> list element: !* >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? >>> list element: * >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> host in limits_advertise_hosts? ->>> list element: !* >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? >>> list element: * >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> host in limits_advertise_hosts? ->>> list element: !* >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? >>> list element: * >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> host in limits_advertise_hosts? ->>> list element: !* >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? >>> list element: * >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts?