LDAP: fix taint-check in server list walk. Bug 2646

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

diff --git a/test/confs/2126 b/test/confs/2126
index 704346e5655105b8c88da59837d883082ee53caa..d98681be2dcdb749ebc5e5c6e75b5ed31afabf01 100644 (file)
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

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

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

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

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


@@ -18,8 +13,6 @@ log_selector = +tls_peerdn
 
 tls_advertise_hosts = HOSTIPV4
 tls_certificate = DIR/aux-fixed/cert1
 
 tls_advertise_hosts = HOSTIPV4
 tls_certificate = DIR/aux-fixed/cert1

-tls_privatekey = DIR/aux-fixed/cert1
-

 
 # ----- ACLs -----
 
 
 # ----- ACLs -----
 


@@ -56,8 +49,10 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   allow_localhost
   allow_localhost

-  tls_try_verify_hosts = :
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile