Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / confs / 5703

diff --git a/test/confs/5703 b/test/confs/5703
index 267f5fc8d1132d487fd3f6afffac4da4e899469c..8c23baca7445b15ea23ccf7460191c022a196e92 100644 (file)
--- a/test/confs/5703
+++ b/test/confs/5703
@@ -1,43 +1,32 @@
 # Exim test configuration 5703
 # Exim test configuration 5703

+# Check for event on dns lookup fail

 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 

-# ----- Main settings -----
-
-event_action = ${acl {logger}}
+primary_hostname = myhost.test.ex

 
 

-# ----- ACL -----
+# ----- Main settings -----

 
 

-begin acl
+acl_smtp_rcpt = accept verify = helo

 
 

-.include DIR/aux-fixed/event-logger-acl
+event_action = ${acl {accept logwrite = M <$event_name> <$event_data>}}

 
 # ----- Routers -----
 
 # ----- Routers -----

-

 begin routers
 begin routers

-
-route_userx:
-  driver = redirect
-  local_parts = userx
-  allow_filter
-  file = DIR/aux-fixed/TESTNUM.filter
-  user = EXIMUSER
-  no_more
-
-route_smtp:
-  driver = manualroute
-  route_list = * 127.0.0.1 byname
-  self = send
-  transport = smtp
-  no_more
+all:
+  driver = accept
+  transport = all
+  errors_to = ""

 
 # ----- Transports -----
 
 # ----- Transports -----

-

 begin transports
 begin transports

-
-smtp:
+all:

   driver = smtp
   driver = smtp

-  port = PORT_S
-  event_action = ${acl {logger}}
+  hosts = ${if inlist {$domain} {nonexistent.test.ex} {$value}}
+  event_action = ${acl {accept logwrite = T <$event_name> <$event_data>}}
+
+# ------ Retries ----
+begin retry
+* * F,10m,2d

 
 # End
 
 # End