Testsuite: TLS client testcase consolidation

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

diff --git a/test/confs/5801 b/test/confs/5801
index f0f21e20b7834e2d67ce3862516f2d4b91b11834..1f13ccbd6ff5cc9dd17e76ce0614aa878f125ad2 100644 (file)
--- a/test/confs/5801
+++ b/test/confs/5801
@@ -2,7 +2,7 @@
 # DANE common
 
 SERVER=
 # DANE common
 
 SERVER=

-CONTROL= *
+OPT=

 
 .include DIR/aux-var/tls_conf_prefix
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -48,16 +48,16 @@ tls_privatekey = ${if eq {SERVER}{server} \
 begin routers
 
 client:
 begin routers
 
 client:

-  driver = dnslookup
-  condition = ${if eq {SERVER}{}}
+  driver =     dnslookup
+  condition =  ${if eq {SERVER}{}}

   dnssec_request_domains = *
   dnssec_request_domains = *

-  self = send
-  transport = send_to_server
-  errors_to = ""
+  self =       send
+  transport =  send_to_server
+  errors_to =  ""

 
 server:
 
 server:

-  driver = redirect
-  data = :blackhole:
+  driver =     redirect
+  data =       :blackhole:

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----


@@ -65,16 +65,14 @@ server:
 begin transports
 
 send_to_server:
 begin transports
 
 send_to_server:

-  driver = smtp
+  driver =             smtp

   allow_localhost
   allow_localhost

-  port = PORT_D
+  port =               PORT_D

   hosts_try_fastopen = :
 
   hosts_try_fastopen = :
 

-  hosts_try_dane =     CONTROL
-  hosts_require_dane = HOSTIPV4
-  tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
-  tls_try_verify_hosts = thishost.test.ex
-  tls_verify_certificates = ${if eq {DETAILS}{ca} {CDIR2/ca_chain.pem} {}}
+  hosts_try_dane =     *
+  tls_sni =            OPT
+  tls_verify_certificates =