ARC: harden versus badly-formatted AMS line

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

diff --git a/test/confs/5860 b/test/confs/5860
index 94436c3449b08b9d64a7c052fb138289228b2a5c..df9115129cff3e5b7f36d8c868f5330759b26dfc 100644 (file)
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -19,20 +19,10 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 # Set certificate only if server
 tls_advertise_hosts = *
 
 # Set certificate only if server

-CDIR1 = DIR/aux-fixed

 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 

-tls_certificate = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
-               {CDIR2/fullchain.pem}\
-               {CDIR1/cert1}}}\
-       fail}
-
-tls_privatekey = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
-               {CDIR2/server1.example.com.unlocked.key}\
-               {CDIR1/cert1}}}\
-       fail}
+tls_certificate = ${if eq {SERVER}{server} {CDIR2/fullchain.pem} fail}
+tls_privatekey = ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key} fail}

 
 
 begin acl
 
 
 begin acl


@@ -74,9 +64,11 @@ send_to_server:
 
 #  hosts_try_dane = *
   hosts_require_dane = *
 
 #  hosts_try_dane = *
   hosts_require_dane = *

+.ifdef _HAVE_OCSP

   hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
                                 {= {0}{$tls_out_tlsa_usage}} } \
                         {*}{}}
   hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
                                 {= {0}{$tls_out_tlsa_usage}} } \
                         {*}{}}

+.endif

 
   event_action =   ${acl {logger}}
 
 
   event_action =   ${acl {logger}}