Merge from master into 4.next

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

diff --git a/test/confs/4007 b/test/confs/4007
index f0792722b629b0d92cdc7bf09da5ca9254595dc6..55bfcfafb8249a2afcbfc6814573b9e8e28ac33b 100644 (file)
--- a/test/confs/4007
+++ b/test/confs/4007
@@ -1,15 +1,10 @@
 # Exim test configuration 4007
 # Content-scan: cmsline interface
 
 # Exim test configuration 4007
 # Content-scan: cmsline 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
 log_selector = +subject

-tls_advertise_hosts =
+primary_hostname = myhost.test.ex

 
 av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)
 
 
 av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)