DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 4006

diff --git a/test/confs/4006 b/test/confs/4006
index c3d2a31422438a957220d2b0d52db3fcce34edc1..f8b216b9981aacb067c045c71559924347cfd08e 100644 (file)
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,17 +1,16 @@
 # Exim test configuration 4006
-# Content-scan: avast interface
+# Content-scan: clamav interface
+
+OPT=
+SRV=unset
+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
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
-av_scanner = avast : DIR/eximdir/avast_sock : OPTION
+av_scanner = clamd : SRV CONTROL
 
 # ----- Main settings -----
 
@@ -21,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 -----