SPF: fix handling mix of spf and other txt records. Bug 2499

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

diff --git a/test/confs/0386 b/test/confs/0386
index c9715f17170d39dfce73912f0525e128fd76a367..0af3202a38a8f5df7c12b0cfb07374775f5e293b 100644 (file)
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -1,20 +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
-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