Merge branch 'master' into dane

[users/jgh/exim.git] / test / stderr / 5420

diff --git a/test/stderr/5420 b/test/stderr/5420
index 36d163f2539eba792c38afc4779cf726b0bcd79d..5694e911f662ca2d6ada0463ebcd519f058814bf 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -32,6 +32,7 @@ expanding: $local_part
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"

+end of ACL "cutthrough": ACCEPT

 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)


@@ -80,6 +81,10 @@ expanding: ${if eq {$address_data}{userz}{*}{:}}
 127.0.0.1 in hosts_verify_avoid_tls? no (end of list)
   SMTP>> STARTTLS
   SMTP<< 220 TLS go ahead
 127.0.0.1 in hosts_verify_avoid_tls? no (end of list)
   SMTP>> STARTTLS
   SMTP<< 220 TLS go ahead

+127.0.0.1 in hosts_require_ocsp? no (option unset)
+127.0.0.1 in hosts_request_ocsp? yes (matched "*")
+ in tls_verify_hosts? no (option unset)
+ in tls_try_verify_hosts? no (option unset)

   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
          250-SIZE 52428800
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
          250-SIZE 52428800


@@ -94,6 +99,7 @@ expanding: ${if eq {$address_data}{userz}{*}{:}}
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL

+end of inline ACL: ACCEPT

   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 expanding: ${tod_full}
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 expanding: ${tod_full}


@@ -188,6 +194,7 @@ expanding: $local_part
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"

+end of ACL "cutthrough": ACCEPT

 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)


@@ -228,6 +235,7 @@ expanding: ${if eq {$address_data}{usery}{*}{:}}
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL

+end of inline ACL: ACCEPT

   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 expanding: ${tod_full}
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 expanding: ${tod_full}


@@ -322,6 +330,7 @@ expanding: $local_part
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"

+end of ACL "cutthrough": ACCEPT

 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)


@@ -362,6 +371,7 @@ expanding: ${if eq {$address_data}{usery}{*}{:}}
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL

+end of inline ACL: ACCEPT

   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 expanding: ${tod_full}
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 expanding: ${tod_full}