Fix $reccipients after ${run...}. Bug 2929

[exim.git] / test / confs / 2033

diff --git a/test/confs/2033 b/test/confs/2033
index 15e632a57d301bdf2d40b0d52b3ec230bb70eeba..44ebbc5949de488772f9976ec2368658f3974ee1 100644 (file)
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -35,9 +35,6 @@ tls_advertise_hosts = *
 tls_certificate = ${if eq {SERVER}{server}{CERT1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{KEY1}fail}
 
 tls_certificate = ${if eq {SERVER}{server}{CERT1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{KEY1}fail}
 

-tls_verify_hosts = *
-tls_verify_certificates = ${if eq {SERVER}{server}{CERT2}fail}
-

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 


@@ -81,7 +78,7 @@ client_r:
 
 client_s:
   driver = accept
 
 client_s:
   driver = accept

-  local_parts = users
+  local_parts = user_s

   retry_use_local_part
   transport = send_to_server_req_passname
 
   retry_use_local_part
   transport = send_to_server_req_passname
 


@@ -103,8 +100,6 @@ send_to_server_failcert:
   port = PORT_D
   hosts_try_fastopen = :
   hosts_require_tls = HOSTIPV4
   port = PORT_D
   hosts_try_fastopen = :
   hosts_require_tls = HOSTIPV4

-  tls_certificate = CERT2
-  tls_privatekey = CERT2

 
   tls_verify_certificates = CA2
 
 
   tls_verify_certificates = CA2
 


@@ -116,8 +111,6 @@ send_to_server_retry:
   port = PORT_D
   hosts_try_fastopen = :
   hosts_require_tls = HOSTIPV4
   port = PORT_D
   hosts_try_fastopen = :
   hosts_require_tls = HOSTIPV4

-  tls_certificate = CERT2
-  tls_privatekey = CERT2

 
   tls_verify_certificates = \
     ${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}
 
   tls_verify_certificates = \
     ${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}


@@ -130,8 +123,6 @@ send_to_server_crypt:
   port = PORT_D
   hosts_try_fastopen = :
   hosts_require_tls = HOSTIPV4
   port = PORT_D
   hosts_try_fastopen = :
   hosts_require_tls = HOSTIPV4

-  tls_certificate = CERT2
-  tls_privatekey = CERT2

 
   tls_verify_certificates = CA2
   tls_try_verify_hosts = *
 
   tls_verify_certificates = CA2
   tls_try_verify_hosts = *


@@ -144,8 +135,6 @@ send_to_server_req_fail:
   hosts = HOSTNAME
   port = PORT_D
   hosts_try_fastopen = :
   hosts = HOSTNAME
   port = PORT_D
   hosts_try_fastopen = :

-  tls_certificate = CERT2
-  tls_privatekey = CERT2

 
   tls_verify_certificates = CA2
   tls_verify_hosts = *
 
   tls_verify_certificates = CA2
   tls_verify_hosts = *


@@ -158,8 +147,6 @@ send_to_server_req_failname:
   hosts = HOSTNAME
   port = PORT_D
   hosts_try_fastopen = :
   hosts = HOSTNAME
   port = PORT_D
   hosts_try_fastopen = :

-  tls_certificate = CERT2
-  tls_privatekey = CERT2

 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *
 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *


@@ -173,8 +160,6 @@ send_to_server_req_passname:
   hosts = server1.example.com
   port = PORT_D
   hosts_try_fastopen = :
   hosts = server1.example.com
   port = PORT_D
   hosts_try_fastopen = :

-  tls_certificate = CERT2
-  tls_privatekey = CERT2

 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *
 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *


@@ -188,8 +173,6 @@ send_to_server_req_failcarryon:
   hosts = HOSTNAME
   port = PORT_D
   hosts_try_fastopen = :
   hosts = HOSTNAME
   port = PORT_D
   hosts_try_fastopen = :

-  tls_certificate = CERT2
-  tls_privatekey = CERT2

 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *
 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *