Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / confs / 0906

diff --git a/test/confs/0906 b/test/confs/0906
index 2e8d35a9112f6aac8b2123b9864e55e4b940b750..0c7b83d5ec8726804fb84a82d70c06eae86899f2 100644 (file)
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -18,7 +18,7 @@ spool_wireformat = true
 primary_hostname = testhost.test.ex
 domainlist local_domains = @ : test.ex
 
 primary_hostname = testhost.test.ex
 domainlist local_domains = @ : test.ex
 

-acl_smtp_rcpt = accept
+acl_smtp_rcpt = acl_r

 log_selector = +received_recipients
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
 log_selector = +received_recipients
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE


@@ -26,8 +26,16 @@ tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
 .endif
 
 tls_privatekey = DIR/aux-fixed/cert1
 .endif
 

+queue_run_in_order = true
+

 # ----- ACL -----
 
 # ----- ACL -----
 

+begin acl
+acl_r:
+ accept        condition = ${if != {$received_port}{PORT_S}}
+       control = queue_only
+ accept
+

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