LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0386

diff --git a/test/confs/0386 b/test/confs/0386
index f88f1b044d3f615aaddc84834ab0747873d69657..d456df5f6ed8cf6d69a741be7f2aee30bd8fb851 100644 (file)
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -1,21 +1,27 @@
 # Exim test configuration 0386
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = DIR/aux-fixed/TESTNUM.acl$local_part
+acl_smtp_rcpt = chk_rcpt
 qualify_domain = test.ex
 trusted_users = CALLER
 
 
+# ----- ACL -----
+begin acl
+
+chk_rcpt:
+  accept       local_parts = 1
+               endpass
+               acl = DIR/aux-fixed/TESTNUM.acl1
+  accept       local_parts = 2
+               endpass
+               acl = DIR/aux-fixed/TESTNUM.acl2
+
 # ----- Routers -----
 
 begin routers
@@ -31,6 +37,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER