Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / confs / 4001

diff --git a/test/confs/4001 b/test/confs/4001
index 0ab60d1a40d83ddd2e11e3d5f30a93561b0bfc3c..85e68a587f52e97a9e63e4b5fb6a05d4afb79104 100644 (file)
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,15 +1,9 @@
 # Exim test configuration 4001
 # Content-scan: f-protd interface
 
 # Exim test configuration 4001
 # Content-scan: f-protd interface
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 av_scanner = f-protd : localhost4 PORT_S
 
 
 av_scanner = f-protd : localhost4 PORT_S