TLS: Deprecate RFC 5114 DH params. Bug 1895

[exim.git] / test / confs / 5001

diff --git a/test/confs/5001 b/test/confs/5001
index 279bea3d4001f4e1f5b7813a1dc61a2b93b34720..68b9d12c7b08e9e8def36b83dd09314d228a3b61 100644 (file)
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -1,12 +1,7 @@
 # Exim test configuration 5001
 
 # Exim test configuration 5001
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -32,9 +27,9 @@ maildir:
   driver = appendfile
   maildir_format
   create_file = belowhome
   driver = appendfile
   maildir_format
   create_file = belowhome

-  directory = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\
-              {${if match{$value}{^/}{}{DIR/}}$value}\
-              {DIR/test-mail/$local_part}}
+  directory = ${lookup {$local_part} lsearch {DIR/aux-fixed/TESTNUM.filelist}\
+               {${if match{$value}{^/}{}{DIR/}}$value}\
+               {DIR/test-mail/$local_part}}

   user = CALLER
 
 
   user = CALLER