DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0227

diff --git a/test/confs/0227 b/test/confs/0227
index 7100f6a15f128db3772f2a0f0c018758b425f851..a0b85c287b528c447e4f21c2889b429ee78c7647 100644 (file)
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -1,14 +1,8 @@
 # Exim test configuration 0227
 
 # Exim test configuration 0227
 

-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 -----
 


@@ -30,8 +24,12 @@ check_recipient:
          !verify   = sender/callout=no_cache
   deny    hosts    = V4NET.0.0.3
          !verify   = recipient/callout=no_cache
          !verify   = sender/callout=no_cache
   deny    hosts    = V4NET.0.0.3
          !verify   = recipient/callout=no_cache

+  deny    hosts    = V4NET.0.0.7
+         !verify   = recipient/callout=no_cache,use_sender,random

   deny    hosts    = V4NET.0.0.5
          !verify   = sender/callout=no_cache/check_postmaster
   deny    hosts    = V4NET.0.0.5
          !verify   = sender/callout=no_cache/check_postmaster

+  deny    hosts    = V4NET.0.0.6
+         !verify   = sender/callout=no_cache

   require verify   = sender
   accept  domains  = +local_domains
   deny    message  = relay not permitted
   require verify   = sender
   accept  domains  = +local_domains
   deny    message  = relay not permitted


@@ -81,13 +79,15 @@ all:
 begin transports
 
 smtp:
 begin transports
 
 smtp:

-  driver = smtp
-  port = PORT_S
+  driver =     smtp
+  port =       PORT_S
+  interface =  ${if eq {bindfail}{$local_part} {1.1.1.1}{}}
+  hosts_try_fastopen = :

 
 lmtp:
 
 lmtp:

-  driver = smtp
-  port = PORT_S
-  protocol = lmtp
+  driver =     smtp
+  port =       PORT_S
+  protocol =   lmtp

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