TLS: fix resumption for TLS-on-connect

[exim.git] / test / stderr / 5204

diff --git a/test/stderr/5204 b/test/stderr/5204
index 5392b04191b95740d3a6dcf82397efcd2011dad5..63238c27cc25e478dce1e5338545a49f2b5b0504 100644 (file)
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -238,8 +238,6 @@ 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)

-host in pipelining_connect_advertise_hosts?
- list element: 

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


@@ -250,7 +248,6 @@ host in pipelining_advertise_hosts?
   host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
   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?

 processing "accept" (TESTSUITE/test-config 79)
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 processing "accept" (TESTSUITE/test-config 79)
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -286,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 >>>>>>>>>>>>>>>>