DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 5702

diff --git a/test/confs/5702 b/test/confs/5702
index e796406c8f0323f396dad68b96ff439f78d3339f..442c42b6f67a04946102196b23a9850eaa8d1682 100644 (file)
--- a/test/confs/5702
+++ b/test/confs/5702
@@ -2,43 +2,55 @@
 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 

+

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

+acl_smtp_rcpt = accept
+acl_smtp_data = accept
+

 event_action = ${acl {logger}}
 
 event_action = ${acl {logger}}
 

+

 # ----- ACL -----
 
 begin acl
 
 .include DIR/aux-fixed/event-logger-acl
 
 # ----- ACL -----
 
 begin acl
 
 .include DIR/aux-fixed/event-logger-acl
 

+conn_deny:
+  accept       !condition =    ${if eq {tcp:connect}{$event_name}}
+  deny         logwrite =      Denying tcp connection
+               message =       deny
+

 # ----- Routers -----
 
 begin routers
 
 # ----- Routers -----
 
 begin routers
 

-route_userx:
+dump_bounces:

   driver = redirect
   driver = redirect

-  local_parts = userx
-  allow_filter
-  file = DIR/aux-fixed/TESTNUM.filter
-  user = EXIMUSER
-  no_more
+  senders = :
+  data = :blackhole:

 
 

-route_smtp:
+others:

   driver = manualroute
   route_list = * 127.0.0.1 byname
   self = send
   transport = smtp
   driver = manualroute
   route_list = * 127.0.0.1 byname
   self = send
   transport = smtp

+  errors_to = ""

   no_more
 
   no_more
 

+

 # ----- Transports -----
 
 begin transports
 
 smtp:
 # ----- Transports -----
 
 begin transports
 
 smtp:

-  driver = smtp
-  port = PORT_S
-  hosts_try_fastopen = :
-  event_action = ${acl {logger}}
+  driver =     smtp
+  port =       PORT_S
+  event_action = ${acl {conn_deny}}
+
+# ----- Retry -----
+begin retry
+* * F,5d,10s

 
 # End
 
 # End