SPF: fix handling mix of spf and other txt records. Bug 2499

[users/heiko/exim.git] / test / confs / 0512

diff --git a/test/confs/0512 b/test/confs/0512
index f2da0f30459dabe71cd8acfe617349676715bc71..7f31b97652a27e6e1d502fcff305541ac8a4f859 100644 (file)
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -2,15 +2,9 @@
 
 HARDLIMIT=
 
 
 HARDLIMIT=
 

-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -37,6 +31,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   hosts_max_try = 1
   HARDLIMIT
   allow_localhost
   hosts_max_try = 1
   HARDLIMIT