Merge branch 'master'

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

diff --git a/test/confs/4004 b/test/confs/4004
index 22cbbd0f487cb824a4ed5a18ccf5cc281e71b41a..e489ee93fab122adb0fb1b9c78d1afbfd44fa6f4 100644 (file)
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -2,12 +2,15 @@
 # Content-scan: sophie interface
 
 exim_path = EXIM_PATH
 # Content-scan: sophie interface
 
 exim_path = EXIM_PATH

+keep_environment =

 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
 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 =

 
 av_scanner = sophie : DIR/eximdir/sophie_sock
 
 
 av_scanner = sophie : DIR/eximdir/sophie_sock
 


@@ -19,7 +22,7 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
 begin acl
 
 c_data:

-  accept !malware = *
+  accept !malware = * OPT

   deny  logwrite = malware_name $malware_name
 
 # ----- Routers -----
   deny  logwrite = malware_name $malware_name
 
 # ----- Routers -----