Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / test / confs / 0230

diff --git a/test/confs/0230 b/test/confs/0230
index 7e0480b2299caee5fbba66dfb8d8ccdc36400893..08a67228ecdd461c41c3592bb7a3a6e840a58247 100644 (file)
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -2,15 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_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
-tls_advertise_hosts =

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


@@ -38,7 +32,7 @@ check_recipient:
 
 begin routers
 
 
 begin routers
 

-.ifdef RT
+.ifdef OPT

 to_server:
   driver = manualroute
   transport = remote
 to_server:
   driver = manualroute
   transport = remote


@@ -63,13 +57,14 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = Port: $sender_host_port
   user = CALLER
 
 remote:
   driver = smtp
   port = PORT_D
   headers_add = Port: $sender_host_port
   user = CALLER
 
 remote:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

 
 # ----- Retry -----
 
 
 # ----- Retry -----