Rename EXPERIMENTAL_SRS to EXPERIMENTAL_SRS_ALT

[users/jgh/exim.git] / test / confs / 5650

diff --git a/test/confs/5650 b/test/confs/5650
index 3d4a68ef38b48e3db6ad6701b73264bfcc19934a..c484282327f637ced7361748ec4d591d8d7483f3 100644 (file)
--- a/test/confs/5650
+++ b/test/confs/5650
@@ -3,14 +3,9 @@
 
 CRL=
 
 
 CRL=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = server1.example.com
 primary_hostname = server1.example.com

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -28,7 +23,7 @@ tls_advertise_hosts = *
 tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
 tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 tls_crl = CRL
 tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
 tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 tls_crl = CRL

-tls_ocsp_file = OCSP
+tls_ocsp_file = OPTION

 
 #tls_verify_hosts = HOSTIPV4
 #tls_try_verify_hosts = *
 
 #tls_verify_hosts = HOSTIPV4
 #tls_try_verify_hosts = *


@@ -41,10 +36,14 @@ tls_ocsp_file = OCSP
 begin acl
 
 check_connect:
 begin acl
 
 check_connect:

-  accept   logwrite = acl_conn: ocsp in status: $tls_in_ocsp
+  accept   logwrite = acl_conn: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})

 
 check_mail:
 
 check_mail:

-  accept   logwrite = acl_mail: ocsp in status: $tls_in_ocsp
+  accept   logwrite = acl_mail: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})

 
 check_recipient:
   accept
 
 check_recipient:
   accept


@@ -66,7 +65,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER