Pass authenticator pubname through spool. Bug 2648

[users/heiko/exim.git] / test / confs / 5890

diff --git a/test/confs/5890 b/test/confs/5890
index f1aa9a2aea48d27ae620ef6c61179216abaf2bce..0c812fd89769535ec7ff1235b09997404f73299b 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}
 


@@ -100,6 +97,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =  :
   event_action =               ${acl {log_resumption}}
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =  :
   event_action =               ${acl {log_resumption}}