Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 0502

diff --git a/test/confs/0502 b/test/confs/0502
index aab2adaae1d5d1b8fd33f27a914744b27e818b38..d1314891defacc7bdba8a032e35be73178729312 100644 (file)
--- a/test/confs/0502
+++ b/test/confs/0502
@@ -2,13 +2,9 @@
 
 LAST=accept message = Your message here
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -33,11 +29,17 @@ check_mail:
   warn  set acl_c1 = ${eval:$acl_c1+1}
   accept
 
+q_sub:
+  deny
+
 check_quit:
   warn     logwrite = Messages received: $acl_c1
            logwrite = Messages accepted: $acl_c0
            logwrite = Recipients:        $acl_c2
            logwrite = Accepted:          $acl_c3
+
+  require  !acl = q_sub
+
   LAST
 
 check_rcpt: