Handle MAIL-before-EHLO under smtp_max_synprot_errors. Bug 3096

[exim.git] / test / confs / 2000

diff --git a/test/confs/2000 b/test/confs/2000
index bc4fff2a4cd6d77bb2eb251b21f3166099bab783..c81c80d59a350d6172dde7c819ab87bdc6177e47 100644 (file)
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

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

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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -30,7 +25,7 @@ tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 tls_verify_hosts = *
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 tls_verify_hosts = *

-tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+tls_verify_certificates = DIR/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -53,8 +48,10 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

-  tls_certificate = DIR/aux-fixed/cert2
-  tls_privatekey = DIR/aux-fixed/cert2
+  hosts_try_fastopen = :
+  tls_certificate =    DIR/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+  tls_privatekey =     DIR/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+

   tls_verify_certificates = DIR/aux-fixed/cert2
   tls_try_verify_hosts =
 
   tls_verify_certificates = DIR/aux-fixed/cert2
   tls_try_verify_hosts =