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

[users/jgh/exim.git] / test / confs / 4006

diff --git a/test/confs/4006 b/test/confs/4006
index 8ac65a584b566387515ae0091e8928f825cd145a..4c7059fdf32f33dcd9cfa12ac34811640c4b1b8e 100644 (file)
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,16 +1,16 @@
 # Exim test configuration 4006
-# Content-scan: avast interface
+# Content-scan: clamav interface
+
+OPT=
+CONTROL=
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
-av_scanner = avast : DIR/eximdir/avast_sock : OPTION
+#XXX we need an additional test for tcp-connected clamd
+av_scanner = clamd : DIR/eximdir/clam_sock CONTROL
 
 # ----- Main settings -----
 
@@ -20,7 +20,7 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
-  accept !malware = * INSERT
+  accept !malware = * OPT
   deny  logwrite = malware_name $malware_name
 
 # ----- Routers -----