Testsuite: hunt harder for more DB utility binaries

[exim.git] / test / stderr / 0620

diff --git a/test/stderr/0620 b/test/stderr/0620
index 5ad58b2130becb4ea35aeaffc2f59a45df0322e3..b0a0114fdb7a9f904c6f69d4dd71ba93cb119068 100644 (file)
--- a/test/stderr/0620
+++ b/test/stderr/0620
@@ -1,21 +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)
@@ -25,6 +32,7 @@ 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
@@ -34,6 +42,8 @@ LOG: MAIN
  ├considering: 0 '$0'  \$1 '$1'
  ├───────text: 0 '
  ├considering: $0'  \$1 '$1'
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
  ├considering: '  \$1 '$1'
  ├───────text: '  
  ├considering: \$1 '$1'
@@ -49,26 +59,33 @@ LOG: MAIN
 LOG: MAIN
   $0 'trythiskey.ex'  $1 ''
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  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)
@@ -77,6 +94,7 @@ LOG: MAIN
  ╭considering: value  $domain_data
  ├───────text: value  
  ├considering: $domain_data
+ ├──────value: trythiskey.ex
  ├──expanding: value  $domain_data
  ╰─────result: value  trythiskey.ex
 LOG: MAIN
@@ -86,6 +104,8 @@ LOG: MAIN
  ├considering: 0 '$0'  \$1 '$1'
  ├───────text: 0 '
  ├considering: $0'  \$1 '$1'
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
  ├considering: '  \$1 '$1'
  ├───────text: '  
  ├considering: \$1 '$1'
@@ -101,5 +121,5 @@ LOG: MAIN
 LOG: MAIN
   $0 'trythiskey.ex'  $1 ''
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>