DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0375

diff --git a/test/confs/0375 b/test/confs/0375
index 2292302095348959583c722620f6a82dd59c8386..3a71bf341e654f78a2ed5f2505c565bd4fcf734a 100644 (file)
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -1,13 +1,8 @@
 # Exim test configuration 0375
 
 # Exim test configuration 0375
 

-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

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -91,6 +86,7 @@ begin transports
 ut1:
   driver = appendfile
   file = DIR/test-mail/$local_part-u
 ut1:
   driver = appendfile
   file = DIR/test-mail/$local_part-u

+  create_file = DIR/test-mail

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add


@@ -119,6 +115,7 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -129,6 +126,7 @@ ut5:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -140,6 +138,7 @@ ut6:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 1
   disable_logging
   allow_localhost
   max_rcpt = 1
   disable_logging


@@ -149,6 +148,7 @@ ut6:
 real:
   driver = appendfile
   file = DIR/test-mail/$local_part
 real:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add