Merge from master into 4.next

[exim.git] / test / confs / 4004

diff --git a/test/confs/4004 b/test/confs/4004
index be674b502decbeea1d88a21d44318bfd96b8b08e..9bc22ce2e39d43a580e3b8a246509a57d8fda522 100644 (file)
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -1,15 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: sophie interface
 
-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
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = sophie : DIR/eximdir/sophie_sock