Docs: note redefined macros for expansions

[exim.git] / test / confs / 5890

diff --git a/test/confs/5890 b/test/confs/5890
index 5b154e5dbd458b8a0a4034d0fab721ac3250e66d..88743cfd0b8b1b2d2bbd8976d38a34dfda345ceb 100644 (file)
--- a/test/confs/5890
+++ b/test/confs/5890
@@ -23,7 +23,6 @@ CDIR=DIR/aux-fixed/exim-ca/example.com
 
 tls_certificate = CDIR/server1.example.com/server1.example.com.chain.pem
 tls_privatekey =  CDIR/server1.example.com/server1.example.com.unlocked.key
 
 tls_certificate = CDIR/server1.example.com/server1.example.com.chain.pem
 tls_privatekey =  CDIR/server1.example.com/server1.example.com.unlocked.key

-tls_ocsp_file =   CDIR/server1.example.com/server1.example.com.ocsp.good.resp

 
 tls_require_ciphers = OPTION
 tls_resumption_hosts = 127.0.0.1
 
 tls_require_ciphers = OPTION
 tls_resumption_hosts = 127.0.0.1


@@ -40,7 +39,6 @@ check_helo:
          logwrite =    peer cert subject\t${certextract {subject}{$tls_in_peercert}}
          logwrite =    peer cert verified\t${tls_in_certificate_verified}
          logwrite =    peer dn\t${tls_in_peerdn}
          logwrite =    peer cert subject\t${certextract {subject}{$tls_in_peercert}}
          logwrite =    peer cert verified\t${tls_in_certificate_verified}
          logwrite =    peer dn\t${tls_in_peerdn}

-         logwrite =    ocsp\t${tls_in_ocsp}

          logwrite =    cipher\t${tls_in_cipher}
          logwrite =    bits\t${tls_in_bits}
   accept
          logwrite =    cipher\t${tls_in_cipher}
          logwrite =    bits\t${tls_in_bits}
   accept


@@ -57,7 +55,6 @@ log_resumption:
          logwrite =    peer cert subject\t${certextract {subject}{$tls_out_peercert}}
          logwrite =    peer cert verified\t${tls_out_certificate_verified}
          logwrite =    peer dn\t${tls_out_peerdn}
          logwrite =    peer cert subject\t${certextract {subject}{$tls_out_peercert}}
          logwrite =    peer cert verified\t${tls_out_certificate_verified}
          logwrite =    peer dn\t${tls_out_peerdn}

-         logwrite =    ocsp\t${tls_out_ocsp}

          logwrite =    cipher\t${tls_out_cipher}
          logwrite =    bits\t${tls_out_bits}
 
          logwrite =    cipher\t${tls_out_cipher}
          logwrite =    bits\t${tls_out_bits}
 


@@ -85,6 +82,9 @@ send_to_server1:
   hosts =                      127.0.0.1
   port =                       PORT_D
   helo_data =                  helo.data.changed
   hosts =                      127.0.0.1
   port =                       PORT_D
   helo_data =                  helo.data.changed

+.ifdef HELO_MSG
+  host_name_extract =          HELO_MSG
+.endif

 .ifdef VALUE
   tls_resumption_hosts =       *
 .else
 .ifdef VALUE
   tls_resumption_hosts =       *
 .else