Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / test / confs / 2031

diff --git a/test/confs/2031 b/test/confs/2031
index 5791316c1d3bd616820e328f8e33b7c1ad3eb424..af27b2ffd6840696f581b6c4389a17d4eaa47329 100644 (file)
--- a/test/confs/2031
+++ b/test/confs/2031
@@ -3,21 +3,16 @@
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix

 
 

+primary_hostname = myhost.test.ex

 
 # ----- Main settings -----
 
 domainlist local_domains = test.ex : *.test.ex
 
 acl_smtp_rcpt = acl_log_sni
 
 # ----- Main settings -----
 
 domainlist local_domains = test.ex : *.test.ex
 
 acl_smtp_rcpt = acl_log_sni

-log_selector = +tls_peerdn +tls_sni
+log_selector = +tls_peerdn +tls_sni +received_recipients

 remote_max_parallel = 1
 
 tls_advertise_hosts = *
 remote_max_parallel = 1
 
 tls_advertise_hosts = *


@@ -70,6 +65,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_sni = fred
 
 send_to_server2:
   tls_sni = fred
 
 send_to_server2:


@@ -77,6 +73,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_sni = bill
 
 
   tls_sni = bill