safer coding of router toplevel

[exim.git] / test / confs / 5840

diff --git a/test/confs/5840 b/test/confs/5840
index 1b3b122b34d7b15782ee8d98d9bc0dae3a093d57..1e6406eaa985d9bf642e246e37bc6105410eb06c 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -23,28 +23,23 @@ queue_run_in_order
 
 tls_advertise_hosts = *
 
-# Set certificate only if server
 CDIR1 = DIR/aux-fixed/exim-ca/example.net/server1.example.net
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
 .ifdef CERT
 tls_certificate = CERT
 .else
-tls_certificate = ${if eq {SERVER}{server} \
-       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
+tls_certificate = ${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
                {CDIR2/fullchain.pem}\
-               {CDIR1/fullchain.pem}}}\
-       fail}
+               {CDIR1/fullchain.pem}}
 .endif
 
 .ifdef ALLOW
 tls_privatekey = ALLOW
 .else
-tls_privatekey = ${if eq {SERVER}{server} \
-       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
+tls_privatekey = ${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
                {CDIR2/server1.example.com.unlocked.key}\
-               {CDIR1/server1.example.net.unlocked.key}}}\
-       fail}
+               {CDIR1/server1.example.net.unlocked.key}}
 .endif
 
 # ----- Routers -----