Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / confs / 4009

diff --git a/test/confs/4009 b/test/confs/4009
index b635195b61c60c2cd55444365852347e57c04b33..f8e832070ea5a5ccbf3522aba9b3420cc6c77962 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -1,16 +1,12 @@
 # Exim test configuration 4009
 # Exim test configuration 4009

-# Content-scan: spamassassin interface
+# Content-scan: sophie interface
+
+.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
 log_selector = +subject

+primary_hostname = myhost.test.ex

 
 

-spamd_address = 127.0.0.1 7833
+av_scanner = sophie : DIR/eximdir/sophie_sock

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -20,11 +16,8 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
 begin acl
 
 c_data:

-  warn
-    spam = nobody
-  warn
-    log_message = $spam_action $spam_report
-  accept
+  accept !malware = * OPT
+  deny  logwrite = malware_name $malware_name

 
 # ----- Routers -----
 
 
 # ----- Routers -----