TLS: fix resumption for TLS-on-connect

[exim.git] / test / stderr / 5204

diff --git a/test/stderr/5204 b/test/stderr/5204
index 0bef3e1b7b64abc1827f8a82a799aa19ef7a2d09..63238c27cc25e478dce1e5338545a49f2b5b0504 100644 (file)
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -238,9 +238,15 @@ host in recipient_unqualified_hosts? no (option unset)
 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 helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)

+some.name in helo_lookup_domains?
+ list element: @
+ list element: @[]

 some.name in helo_lookup_domains? no (end of list)
 host in dsn_advertise_hosts? no (option unset)
 some.name in helo_lookup_domains? no (end of list)
 host in dsn_advertise_hosts? no (option unset)

-host in pipelining_advertise_hosts? yes (matched "*")
+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)
 processing "accept" (TESTSUITE/test-config 79)
 check verify = recipient
 host in chunking_advertise_hosts? no (end of list)
 processing "accept" (TESTSUITE/test-config 79)
 check verify = recipient


@@ -249,13 +255,20 @@ routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders

-y in ""? no (end of list)
+x@y in ":"?
+ list element: 
+ y in ""?
+ y in ""? no (end of list)

 x@y in ":"? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains
 x@y in ":"? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains

-some.host in "test.ex"? no (end of list)
+some.host in "! +local_domains"?
+ list element: ! +local_domains
+ some.host in "test.ex"?
+  list element: test.ex
+ some.host in "test.ex"? no (end of list)

 some.host in "! +local_domains"? yes (end of list)
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 some.host in "! +local_domains"? yes (end of list)
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host


@@ -270,5 +283,5 @@ end of inline ACL: implicit DENY
 LOG: MAIN REJECT
   H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one (FAIL)"@some.host>: cannot route this one (FAIL)
 LOG: smtp_connection MAIN
 LOG: MAIN REJECT
   H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one (FAIL)"@some.host>: cannot route this one (FAIL)
 LOG: smtp_connection MAIN

-  SMTP connection from (some.name) [V4NET.2.3.4] closed by QUIT
+  SMTP connection from (some.name) [V4NET.2.3.4] D=qqs closed by QUIT

 >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>