X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4da19af657ed2687d20c1eb8cf85a66a70804e2d..90bd3832bc0ff090ac5e37dfc66b30cabb9cfc1a:/test/stderr/0620

diff --git a/test/stderr/0620 b/test/stderr/0620
index 5ad58b213..852014746 100644
--- a/test/stderr/0620
+++ b/test/stderr/0620
@@ -1,21 +1,39 @@
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
+try option gecos_pattern
+try option gecos_name
+try option unknown_login
+try option smtp_active_hostname
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
+try option message_size_limit
+try option acl_smtp_connect
+try option smtp_banner
  ╭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
+try option spf_smtp_comment_template
+try option acl_smtp_helo
+try option acl_smtp_mail
+try option acl_smtp_rcpt
  ╭considering: domain $domain
  ├───────text: domain 
  ├considering: $domain
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)
@@ -25,6 +43,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 +53,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'
@@ -48,27 +69,46 @@ LOG: MAIN
             ╰──(tainted)
 LOG: MAIN
   $0 'trythiskey.ex'  $1 ''
+try option acl_smtp_quit
 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
+try option gecos_pattern
+try option gecos_name
+try option unknown_login
+try option smtp_active_hostname
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
+try option message_size_limit
+try option acl_smtp_connect
+try option smtp_banner
  ╭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
+try option spf_smtp_comment_template
+try option acl_smtp_helo
+try option acl_smtp_mail
+try option acl_smtp_rcpt
  ╭considering: domain $domain
  ├───────text: domain 
  ├considering: $domain
+ ├──────value: trythiskey.ex
+            ╰──(tainted)
  ├──expanding: domain $domain
  ╰─────result: domain trythiskey.ex
             ╰──(tainted)
@@ -77,6 +117,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 +127,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'
@@ -100,6 +143,7 @@ LOG: MAIN
             ╰──(tainted)
 LOG: MAIN
   $0 'trythiskey.ex'  $1 ''
+try option acl_smtp_quit
 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 >>>>>>>>>>>>>>>>