Fix taint issue in transport with DSN. Bug 2491

[users/jgh/exim.git] / test / confs / 2112

diff --git a/test/confs/2112 b/test/confs/2112
index cbd0babc6cd1cb63e81f6d1e2d555e45e2f4c04a..2b3f33ed3845890dafa7b1e5ef3541e9e274acce 100644 (file)
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -3,13 +3,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

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

 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com


@@ -25,7 +21,7 @@ KEY2 =  FX/cert2
 
 acl_smtp_rcpt = accept
 
 
 acl_smtp_rcpt = accept
 

-log_selector =  +tls_peerdn+tls_certificate_verified
+log_selector =  +tls_peerdn+tls_certificate_verified +received_recipients

 
 queue_only
 queue_run_in_order
 
 queue_only
 queue_run_in_order


@@ -83,7 +79,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
 


@@ -97,8 +93,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -111,8 +108,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -126,8 +124,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -141,6 +140,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -148,12 +148,13 @@ send_to_server_req_fail:
   tls_verify_hosts = *
   tls_verify_cert_hostnames =
 
   tls_verify_hosts = *
   tls_verify_cert_hostnames =
 

- # this will fail to verify the cert name and fallback to unencrypted
- send_to_server_req_failname:
+# this will fail to verify the cert name and fallback to unencrypted
+send_to_server_req_failname:

    driver = smtp
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
    driver = smtp
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D

+  hosts_try_fastopen = :

    tls_certificate = CERT2
    tls_privatekey = CERT2
  
    tls_certificate = CERT2
    tls_privatekey = CERT2
  


@@ -161,12 +162,13 @@ send_to_server_req_fail:
    tls_verify_cert_hostnames = server1.example.net : server1.example.org
    tls_verify_hosts = *
  
    tls_verify_cert_hostnames = server1.example.net : server1.example.org
    tls_verify_hosts = *
  

- # this will pass the cert verify including name check
- send_to_server_req_passname:
+# this will pass the cert verify including name check
+send_to_server_req_passname:

    driver = smtp
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
    driver = smtp
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D

+  hosts_try_fastopen = :

    tls_certificate = CERT2
    tls_privatekey = CERT2
  
    tls_certificate = CERT2
    tls_privatekey = CERT2