Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / stderr / 5820

diff --git a/test/stderr/5820 b/test/stderr/5820
index 7cc0b5f76bf2f9ca1dc33d3c56d977b3d3f5bbc2..362fffd9499ac8b57769f59902cfebeb5c14ac19 100644 (file)
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -9,8 +9,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: @[]
@@ -20,9 +18,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex
 >>> calling client router
->>> dane256ee.test.ex in "*"?
->>>  list element: *
->>>  dane256ee.test.ex in "*"? yes (matched "*")
+>>>  check dnssec require list
+>>>   dane256ee.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   dane256ee.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    dane256ee.test.ex in dnssec_request_domains? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by client router
 >>> Attempting full verification using callout
@@ -32,15 +33,17 @@
 >>>  list element: ip4.ip4.ip4.ip4
 >>>  ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4")
 >>> interface=NULL port=PORT_D
->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ... ip4.ip4.ip4.ip4 in hosts_try_fastopen?
->>>  list element: 
->>> >>>  connected
+>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ...
+>>>  ip4.ip4.ip4.ip4 in hosts_try_fastopen?
+>>>   list element: 
+>>> connected
 >>>   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>> cmd buf flush 21 bytes
 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
+>>>          250-LIMITS MAILMAX=1000 RCPTMAX=50000
 >>>          250-8BITMIME
 >>>          250-PIPELINING
 >>>          250-STARTTLS
@@ -56,6 +59,7 @@
 >>> cmd buf flush 21 bytes
 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
+>>>          250-LIMITS MAILMAX=1000 RCPTMAX=50000
 >>>          250-8BITMIME
 >>>          250-PIPELINING
 >>>          250 HELP