X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F5891;fp=test%2Fconfs%2F5891;h=165921d262087cdbfd190d33708915923d5d1bf3;hb=f4e62a871680af98f14beb5f21dbe3b85c5c35ff;hp=599a6e3f0cd22d6506c63ec20143e61ab59d8371;hpb=dea4b5684c694c41105215bdb25f8e91b7c35c5d;p=exim.git

diff --git a/test/confs/5891 b/test/confs/5891
index 599a6e3f0..165921d26 100644
--- a/test/confs/5891
+++ b/test/confs/5891
@@ -63,10 +63,9 @@ log_resumption:
 begin routers
 
 client:
-  driver = accept
-  condition = ${if eq {SERVER}{server}{no}{yes}}
-  retry_use_local_part
-  transport = send_to_server${if eq{$local_part}{abcd}{2}{1}}
+  driver =	accept
+  condition =	${if eq {SERVER}{server}{no}{yes}}
+  transport =	send_to_server${if eq{$local_part}{abcd}{2}{1}}
 
 server:
   driver = redirect
@@ -77,19 +76,20 @@ server:
 begin transports
 
 send_to_server1:
-  driver = smtp
+  driver =			smtp
   allow_localhost
-  hosts = 127.0.0.1
-  port = PORT_D
-  helo_data = helo.data.changed
+  hosts =			127.0.0.1
+  port =			PORT_D
+  helo_data =			helo.data.changed
 .ifdef VALUE
-  tls_resumption_hosts = *
+  tls_resumption_hosts =	*
 .else
-  tls_resumption_hosts = :
+  tls_resumption_hosts =	:
 .endif
-  tls_verify_certificates = DIR/aux-fixed/cert1
-  tls_verify_cert_hostnames = :
-  event_action =	${acl {log_resumption}}
+  tls_verify_certificates =	DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =	${if match {$local_part}{^noverify} {*}{:}}
+  tls_try_verify_hosts =	*
+  event_action =		${acl {log_resumption}}
 
 send_to_server2:
   driver = smtp