Call notquite ACL for synprot-error limit. Bug 3092

[exim.git] / test / confs / 0610

diff --git a/test/confs/0610 b/test/confs/0610
index 9f1e25307f99ec44b6a34954e6085f13434a19e6..370391b9579ead0731809ce53e48785de416ead4 100644 (file)
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -2,17 +2,10 @@
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+

 rfc1413_query_timeout = 0s
 rfc1413_query_timeout = 0s

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog

 log_selector = +sender_on_delivery
 log_selector = +sender_on_delivery

-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -28,16 +21,24 @@ queue_run_in_order
 begin acl
 
 conn_chk:
 begin acl
 
 conn_chk:

+.ifdef DELAY

   defer        condition = ${if eq {SERVER}{server}}
   defer        condition = ${if eq {SERVER}{server}}

+.endif

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

-client:
+r1:
+  driver = accept
+  condition = ${if eq {t1}{$sender_address_local_part}}
+  transport = t1
+
+r2:

   driver = accept
   driver = accept

-  transport = $sender_address_local_part
+  condition = ${if eq {t2}{$sender_address_local_part}}
+  transport = t2

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


@@ -49,6 +50,7 @@ t1:
   hosts = 127.0.0.1
   port = PORT_D
   interface = 127.0.0.1
   hosts = 127.0.0.1
   port = PORT_D
   interface = 127.0.0.1

+  hosts_try_fastopen = :

 
 t2:
   driver = smtp
 
 t2:
   driver = smtp


@@ -56,12 +58,13 @@ t2:
   hosts = 127.0.0.1
   port = PORT_D
   interface = HOSTIPV4
   hosts = 127.0.0.1
   port = PORT_D
   interface = HOSTIPV4

+  hosts_try_fastopen = :

 
 # ----- Retry -----
 
 begin retry
 
 
 # ----- Retry -----
 
 begin retry
 

-* * F,5d,10s
+* * F,5d,1s

 
 # End
 
 
 # End