testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 0041

diff --git a/test/confs/0041 b/test/confs/0041
index 996e322e7ec0be28a13c3a89ae0c35b8908e5ac3..e0bd3e2f3e8bb6f3854f299ab6c3ea8c32c34034 100644 (file)
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -1,25 +1,30 @@
 # Exim test configuration 0041
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
 domainlist local_domains = test.ex
 
+acl_smtp_vrfy = check_vrfy
 acl_smtp_expn = check_expn
 qualify_domain = test.ex
 no_write_rejectlog
+recipient_unqualified_hosts = 3.3.3.3
 
 
 # ----- ACLs -----
 
 begin acl
 
+check_vrfy:
+  deny  local_parts = hardfail
+         message = 599 custom reject
+  accept local_parts = acceptable
+  accept local_parts = ok_with_dom
+        domains = test.ex
+
 check_expn:
   accept hosts = 2.2.2.2
 
@@ -35,7 +40,7 @@ system_aliases:
 
 localuser:
   driver = accept
-  local_parts = userx
+  local_parts = userx : ok_with_dom : acceptable
   transport = local_delivery
 
 
@@ -48,6 +53,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER