DKIM: tighten up parsing for DKIM DNS and header records. Bug 3056

[exim.git] / test / confs / 5721

diff --git a/test/confs/5721 b/test/confs/5721
index d156b1bf528d7de5373389ad4c6feea7b8d5b64a..6839bd5284d4c41a055f5c313dba411a0ac774a6 100644 (file)
--- a/test/confs/5721
+++ b/test/confs/5721
@@ -6,7 +6,7 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-acl_smtp_connect = accept logwrite = ACL conn
+acl_smtp_connect = check_conn
 acl_smtp_quit =    accept logwrite = ACL quit
 acl_smtp_notquit = accept logwrite = ACL notquit
 
@@ -14,15 +14,29 @@ tls_advertise_hosts = *
 tls_certificate = DIR/aux-fixed/cert1
 
 host_reject_connection = ${acl {hrc}}
+smtp_banner = ${if != {$received_port}{PORT_D4} {my banner}fail}
 event_action = ${acl {tls_fail}}
 
+log_selector = +pid
+
 # ------ ACL ------
 
 begin acl
 
 hrc:
-  accept       logwrite = eval host_reject_connection
+  warn         logwrite = eval host_reject_connection
+  accept       condition = ${if eq {$received_port}{PORT_D}}
                # no mesage= hence host_reject_connection should be empty
+  deny         condition = ${if eq {$received_port}{PORT_D2}}
+               message = *
+                # PORT_D2 gets a host_reject_connection
+
+check_conn:
+  warn         logwrite =      ACL conn
+  deny         condition =     ${if eq {$received_port}{PORT_D3}}
+               log_message =   we dislike you
+               # PORT_D3 gets a conn ACL fail
+  accept
 
 tls_fail:
   warn         logwrite =  EV $event_name