Avoid re-expansion in ${sort } CVE-2019-13917 OVE-20190718-0006

[exim.git] / test / confs / 0550

diff --git a/test/confs/0550 b/test/confs/0550
index 865b97a52df222a18f6f5a218f616da39fc791dc..caf3ceda7cab34c00a5c0cb70214f20de0494453 100644 (file)
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -1,13 +1,8 @@
 # Exim test configuration 0550
 
 # Exim test configuration 0550
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -29,7 +24,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S

-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}

   allow_localhost
   helo_data = \
     ${if eq{$sending_ip_address}{127.0.0.1}{Tweedledum}{Tweedledee}} \
   allow_localhost
   helo_data = \
     ${if eq{$sending_ip_address}{127.0.0.1}{Tweedledum}{Tweedledee}} \