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

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

diff --git a/test/confs/2110 b/test/confs/2110
index 2bd3ed65684a4aca9ff684fb383fd031fbea42df..cc4a7f03279a76fe71ee98dba7b1840251eb06a4 100644 (file)
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -3,16 +3,14 @@
 SERVER =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
 SERVER =
 HOSTS = 127.0.0.1 : HOSTIPV4
 

-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

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

+log_selector = +outgoing_port
+

 acl_smtp_rcpt = accept
 
 queue_only
 acl_smtp_rcpt = accept
 
 queue_only


@@ -45,8 +43,9 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTS
   driver = smtp
   allow_localhost
   hosts = HOSTS

-  hosts_require_tls = *

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = *

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