Fix CVE-2016-1531

[exim.git] / test / confs / 2026

diff --git a/test/confs/2026 b/test/confs/2026
index 4185e0b7978d450c437a934f6996f36266918eb4..7da11a528625b61a7b4b73be867f33fdf0944038 100644 (file)
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -1,11 +1,15 @@
 # Exim test configuration 2026
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
+.ifdef SERVER
 log_file_path = DIR/spool/log/%slog
+.else
+log_file_path = DIR/spool/log/%D-%slog
+.endif
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 
@@ -14,6 +18,7 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = check_rcpt
 log_selector = +tls_peerdn
 
+
 tls_advertise_hosts = HOSTIPV4
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
@@ -25,12 +30,12 @@ begin acl
 
 check_rcpt:
   accept  local_parts = userx
+          control = queue_only
 
   defer   local_parts = usery
           hosts       = 127.0.0.1
 
-  accept
-
+  accept  control = queue_only
 
 # ----- Routers -----