Merge branch 'master' into 4.next

[exim.git] / test / confs / 5204

diff --git a/test/confs/5204 b/test/confs/5204
index a134270a64a3d2ff92ae2402242352b02d3f7247..2393a5778fc33d4fcf189895a45b9a7aaa8da390 100644 (file)
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -1,16 +1,19 @@
 # Exim test configuration 5204
 
+COMMAND_USER=EXIMUSER
+
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+tls_advertise_hosts =
 
 # ----- Main settings -----
 
+acl_smtp_rcpt = accept verify = recipient
 domainlist local_domains = test.ex
 
 # ----- Routers -----
@@ -27,7 +30,7 @@ q:
   caseful_local_part
   command = /bin/echo \
     "${if match{$local_part}{^\"([^\"]*)\"(.*)\\$}{$1$2}{$local_part}}"
-  command_user = EXIMUSER
+  command_user = COMMAND_USER
   domains = ! +local_domains
   no_more
   transport = smtp