Testsuite: output changes resulting

[exim.git] / test / confs / 4620

diff --git a/test/confs/4620 b/test/confs/4620
index 26906e7c74a5b0c8d6bd018921efd60967fd3527..effc845a52db89acb5527390ebbcfa449425406b 100644 (file)
--- a/test/confs/4620
+++ b/test/confs/4620
@@ -11,19 +11,29 @@ acl_smtp_rcpt = accept
 domainlist local_domains = test.ex
 domainlist remotesite_domains = remote.ex
 
 domainlist local_domains = test.ex
 domainlist remotesite_domains = remote.ex
 

-log_selector = +all_parents +received_recipients
+log_selector = +all_parents +received_recipients +return_path_on_delivery

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

+.ifdef CONTROL

 remote_bouncer:
   driver =     redirect
   condition =  ${if eq {$sender_host_address}{127.0.0.1}}
   data =       :fail: account disabled
   allow_fail
 
 remote_bouncer:
   driver =     redirect
   condition =  ${if eq {$sender_host_address}{127.0.0.1}}
   data =       :fail: account disabled
   allow_fail
 

+bounce_return:
+  driver =     manualroute
+  domains =    +local_domains
+  senders =    :
+  route_list = test.ex         127.0.0.1::PORT_S
+  self =       send
+  transport =  to_external
+.endif
+

 external:
   driver =     manualroute
   domains =    !+local_domains
 external:
   driver =     manualroute
   domains =    !+local_domains


@@ -32,6 +42,7 @@ external:
   transport =  ${if eq {$local_part@$domain} {$original_local_part@$original_domain} \
                        {to_external} {forwarded_external}}
 
   transport =  ${if eq {$local_part@$domain} {$original_local_part@$original_domain} \
                        {to_external} {forwarded_external}}
 

+.ifndef CONTROL

 inbound_srs:
   driver =     redirect
   senders =    :
 inbound_srs:
   driver =     redirect
   senders =    :


@@ -48,7 +59,7 @@ inbound_srs_failure:
   condition =  ${if inbound_srs {$local_part} {}}
   allow_fail
   data =       :fail: Invalid SRS recipient address
   condition =  ${if inbound_srs {$local_part} {}}
   allow_fail
   data =       :fail: Invalid SRS recipient address

-
+.endif

 
 local_redirect:
   driver =     redirect
 
 local_redirect:
   driver =     redirect


@@ -75,7 +86,8 @@ forwarded_external:
 
 appendfile:
   driver =     appendfile
 
 appendfile:
   driver =     appendfile

-  file =       DIR/test-mail/${bless:$local_part}
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail

   user =       CALLER
 
 # ----- Retry -----
   user =       CALLER
 
 # ----- Retry -----