Fix handling of server which follows a RCPT 452 with a 250. Bug 26092

[exim.git] / test / confs / 0622

diff --git a/test/confs/0622 b/test/confs/0622
index 486bac27d54efb4c55e8d27eff00b3ff8898a637..5dc3e0f94d785fe3a3e2a779d002a01d49575b3d 100644 (file)
--- a/test/confs/0622
+++ b/test/confs/0622
@@ -1,49 +1,79 @@
 # Exim test configuration 0622
 # Exim test configuration 0622

-# Bounces
+
+SERVER=

 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex

+log_selector = +pipelining +received_recipients
+

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

-acl_smtp_rcpt = accept
-log_selector = +received_recipients +millisec
+acl_smtp_connect = check_connect
+acl_smtp_rcpt = check_rcpt
+
+begin acl
+
+check_connect:
+       accept
+               logwrite = :main:New connection
+
+check_rcpt:
+       defer
+               condition = ${if eq {$acl_m0}{1}}
+               recipients = B@test.ex : C@test.ex : D@test.ex : E@test.ex : F@test.ex 
+               message = 452 4.5.3 Try again
+
+       defer
+               condition = ${if eq {$acl_m0}{2}}
+               recipients = C@test.ex : D@test.ex
+               message = 452 4.5.3 Try again

 
 

-.ifdef OPT
-bounce_message_file = OPT
-warn_message_file = OPT
-.endif
+       warn
+               recipients = A@test.ex
+               set acl_m0 = 1
+
+       warn
+               recipients = B@test.ex
+               set acl_m0 = 2
+
+       accept

 
 

-delay_warning =        1s

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

-delay:
+server:

   driver =     redirect
   driver =     redirect

-  local_parts =        ^delay
-  allow_defer
-  data =       :defer: deliberate for test purposes
+  condition =  ${if eq {SERVER}{server} {yes}{no}}
+  data =       :blackhole:

 
 

-bounces:
+client:

   driver =     accept
   driver =     accept

-  condition =  ${if !def:sender_address}
-  transport =  savebounce
+  condition =  ${if eq {SERVER}{server} {no}{yes}}
+  retry_use_local_part
+  transport =  send_to_server
+
+
+# ----- Transports -----

 
 begin transports
 
 
 begin transports
 

-savebounce:
-  driver =     appendfile
-  file =       DIR/test-mail/bounce_message
-  user =       CALLER
+send_to_server:
+  driver = smtp
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+  max_rcpt = 0

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

+

 begin retry
 
 begin retry
 

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

 
 
 # End
 
 
 # End