X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6bacc7090a4d219a48899c5b5b08b33f4811dc7f..8a2fd4b22738aa6cceaf2ddd7755f376cb8460a3:/test/stderr/0620

diff --git a/test/stderr/0620 b/test/stderr/0620
index 455a3ee1b..b0a0114fd 100644
--- a/test/stderr/0620
+++ b/test/stderr/0620
@@ -1,13 +1,28 @@
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
 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
+ ├──────value: x.yz
+ ├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
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)
@@ -15,45 +30,96 @@ LOG: MAIN
   domain trythiskey.ex
 created log directory TESTSUITE/spool/log
  ╭considering: value  $domain_data
+ ├───────text: value  
+ ├considering: $domain_data
+ ├──────value: has this data
  ├──expanding: value  $domain_data
  ╰─────result: value  has this data
 LOG: MAIN
   value  has this data
  ╭considering: \$0 '$0'  \$1 '$1'
+ ├backslashed: '\$'
+ ├considering: 0 '$0'  \$1 '$1'
+ ├───────text: 0 '
+ ├considering: $0'  \$1 '$1'
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
+ ├considering: '  \$1 '$1'
+ ├───────text: '  
+ ├considering: \$1 '$1'
+ ├backslashed: '\$'
+ ├considering: 1 '$1'
+ ├───────text: 1 '
+ ├considering: $1'
+ ├considering: '
+ ├───────text: '
  ├──expanding: \$0 '$0'  \$1 '$1'
  ╰─────result: $0 'trythiskey.ex'  $1 ''
             ╰──(tainted)
 LOG: MAIN
   $0 'trythiskey.ex'  $1 ''
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from CALLER D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
 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
+ ├──────value: x.yz
+ ├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
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)
 LOG: MAIN
   domain trythiskey.ex
  ╭considering: value  $domain_data
+ ├───────text: value  
+ ├considering: $domain_data
+ ├──────value: trythiskey.ex
  ├──expanding: value  $domain_data
  ╰─────result: value  trythiskey.ex
 LOG: MAIN
   value  trythiskey.ex
  ╭considering: \$0 '$0'  \$1 '$1'
+ ├backslashed: '\$'
+ ├considering: 0 '$0'  \$1 '$1'
+ ├───────text: 0 '
+ ├considering: $0'  \$1 '$1'
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
+ ├considering: '  \$1 '$1'
+ ├───────text: '  
+ ├considering: \$1 '$1'
+ ├backslashed: '\$'
+ ├considering: 1 '$1'
+ ├───────text: 1 '
+ ├considering: $1'
+ ├considering: '
+ ├───────text: '
  ├──expanding: \$0 '$0'  \$1 '$1'
  ╰─────result: $0 'trythiskey.ex'  $1 ''
             ╰──(tainted)
 LOG: MAIN
   $0 'trythiskey.ex'  $1 ''
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from CALLER D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>