X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/7ef88aa0c4c0608ee54ed2ff90b4b34c518d9bb5..e4e884faa7f5a04d937282113681d97a355ed2af:/test/confs/4620

diff --git a/test/confs/4620 b/test/confs/4620
index 5b1175a53..ad115c962 100644
--- 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
 
-log_selector = +all_parents +received_recipients
+log_selector = +all_parents +received_recipients +return_path_on_delivery
 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
 
+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
@@ -32,6 +42,7 @@ external:
   transport =	${if eq {$local_part@$domain} {$original_local_part@$original_domain} \
 			{to_external} {forwarded_external}}
 
+.ifndef CONTROL
 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
-
+.endif
 
 local_redirect:
   driver =	redirect
@@ -75,7 +86,7 @@ forwarded_external:
 
 appendfile:
   driver =	appendfile
-  file =	DIR/test-mail/$local_part
+  file =	DIR/test-mail/${bless:$local_part}
   user =	CALLER
 
 # ----- Retry -----