Move ESMPT LIMITS extension from experimental to mainline

[exim.git] / test / stderr / 0620

diff --git a/test/stderr/0620 b/test/stderr/0620
index 577a8771db3ca49ba3f5884ec75e8dccd2059643..b0a0114fdb7a9f904c6f69d4dd71ba93cb119068 100644 (file)
--- a/test/stderr/0620
+++ b/test/stderr/0620
@@ -7,17 +7,22 @@ admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full

+ ├──────value: primaryhostname.ex

  ├considering:  ESMTP Exim $version_number $tod_full
  ├───────text:  ESMTP Exim 
  ├considering: $version_number $tod_full
  ├considering:  ESMTP Exim $version_number $tod_full
  ├───────text:  ESMTP Exim 
  ├considering: $version_number $tod_full

+ ├──────value: x.yz

  ├considering:  $tod_full
  ├───────text:  
  ├considering: $tod_full
  ├considering:  $tod_full
  ├───────text:  
  ├considering: $tod_full

+ ├──────value: Tue, 2 Mar 1999 09:44:33 +0000

  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: primaryhostname.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: domain $domain
  ├───────text: domain 
  ├considering: $domain
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: primaryhostname.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: domain $domain
  ├───────text: domain 
  ├considering: $domain

+ ├──────value: trythiskey.ex
+            ╰──(tainted)

  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)
  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)


@@ -27,6 +32,7 @@ created log directory TESTSUITE/spool/log
  ╭considering: value  $domain_data
  ├───────text: value  
  ├considering: $domain_data
  ╭considering: value  $domain_data
  ├───────text: value  
  ├considering: $domain_data

+ ├──────value: has this data

  ├──expanding: value  $domain_data
  ╰─────result: value  has this data
 LOG: MAIN
  ├──expanding: value  $domain_data
  ╰─────result: value  has this data
 LOG: MAIN


@@ -36,6 +42,8 @@ LOG: MAIN
  ├considering: 0 '$0'  \$1 '$1'
  ├───────text: 0 '
  ├considering: $0'  \$1 '$1'
  ├considering: 0 '$0'  \$1 '$1'
  ├───────text: 0 '
  ├considering: $0'  \$1 '$1'

+ ├──────value: trythiskey.ex
+            ╰──(tainted)

  ├considering: '  \$1 '$1'
  ├───────text: '  
  ├considering: \$1 '$1'
  ├considering: '  \$1 '$1'
  ├───────text: '  
  ├considering: \$1 '$1'


@@ -62,17 +70,22 @@ admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full

+ ├──────value: primaryhostname.ex

  ├considering:  ESMTP Exim $version_number $tod_full
  ├───────text:  ESMTP Exim 
  ├considering: $version_number $tod_full
  ├considering:  ESMTP Exim $version_number $tod_full
  ├───────text:  ESMTP Exim 
  ├considering: $version_number $tod_full

+ ├──────value: x.yz

  ├considering:  $tod_full
  ├───────text:  
  ├considering: $tod_full
  ├considering:  $tod_full
  ├───────text:  
  ├considering: $tod_full

+ ├──────value: Tue, 2 Mar 1999 09:44:33 +0000

  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: primaryhostname.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: domain $domain
  ├───────text: domain 
  ├considering: $domain
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: primaryhostname.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: domain $domain
  ├───────text: domain 
  ├considering: $domain

+ ├──────value: trythiskey.ex
+            ╰──(tainted)

  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)
  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)


@@ -81,6 +94,7 @@ LOG: MAIN
  ╭considering: value  $domain_data
  ├───────text: value  
  ├considering: $domain_data
  ╭considering: value  $domain_data
  ├───────text: value  
  ├considering: $domain_data

+ ├──────value: trythiskey.ex

  ├──expanding: value  $domain_data
  ╰─────result: value  trythiskey.ex
 LOG: MAIN
  ├──expanding: value  $domain_data
  ╰─────result: value  trythiskey.ex
 LOG: MAIN


@@ -90,6 +104,8 @@ LOG: MAIN
  ├considering: 0 '$0'  \$1 '$1'
  ├───────text: 0 '
  ├considering: $0'  \$1 '$1'
  ├considering: 0 '$0'  \$1 '$1'
  ├───────text: 0 '
  ├considering: $0'  \$1 '$1'

+ ├──────value: trythiskey.ex
+            ╰──(tainted)

  ├considering: '  \$1 '$1'
  ├───────text: '  
  ├considering: \$1 '$1'
  ├considering: '  \$1 '$1'
  ├───────text: '  
  ├considering: \$1 '$1'