TLS: fix resumption for TLS-on-connect

[exim.git] / test / stderr / 0524

diff --git a/test/stderr/0524 b/test/stderr/0524
index e466df52eb8adcfa880acbe3891bf047548940d0..f515c0622122a59c69ddf6f1cacadb4a9f78f501 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -6,17 +6,38 @@
 >>> 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)
+>>> csa1.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> 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)
 >>> using ACL "check_mail"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test succeeded in ACL "check_mail"
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> end of ACL "check_mail": ACCEPT
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> csa2.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> 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)
 >>> using ACL "check_mail"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access
@@ -29,19 +50,39 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> 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)
+>>> csa1.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> 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)
 >>> using ACL "check_mail"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
->>> 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 "*")
+>>> csa2.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> 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)
 >>> using ACL "check_mail"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
+>>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access