Merge branch 'master' into 4.next

[exim.git] / test / confs / 4004

diff --git a/test/confs/4004 b/test/confs/4004
index 22cbbd0f487cb824a4ed5a18ccf5cc281e71b41a..be674b502decbeea1d88a21d44318bfd96b8b08e 100644 (file)
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -8,6 +8,8 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 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 +21,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 -----