Fix "-bP smtp_receive_timeout". Bug 2384

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 7a1296c7ed4b57c9ddf0c004b4ae1929a99541f3..caf17be81bfc7751e9bafee102f49931ad1310df 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -13,6 +13,12 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}

+.ifdef _HAVE_REQTLS
+tls_advertise_requiretls = :
+.endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif

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


@@ -26,10 +32,17 @@ acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s

+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else

 log_selector = +received_recipients
 log_selector = +received_recipients

+.endif

 
 

+.ifdef _OPT_MAIN_TLS_CERTIFICATE

 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}

+.endif

 
 ALLOW
 
 
 ALLOW
 


@@ -50,7 +63,6 @@ check_data:
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 

-

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -58,7 +70,7 @@ begin routers
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}

-  transport =  remote_smtp${if eq {OPT}{dkim} {_dkim}}
+  transport =  remote_smtp${if eq {SRV}{dkim} {_dkim}}

   errors_to =  ""
 
 fail_remote_domains:
   errors_to =  ""
 
 fail_remote_domains:


@@ -94,7 +106,6 @@ remote_smtp:
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s

-  headers_rewrite = *@* CALLER_NAME@$domain fs

 
 remote_smtp_dkim:
   driver = smtp
 
 remote_smtp_dkim:
   driver = smtp


@@ -103,9 +114,9 @@ remote_smtp_dkim:
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s

-  headers_rewrite = *@* CALLER_NAME@$domain fs

 
 

-.ifdef OPT
+.ifdef _HAVE_DKIM
+.ifdef SRV

   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private


@@ -113,6 +124,7 @@ remote_smtp_dkim:
   dkim_sign_headers =  LIST
 .endif
 .endif
   dkim_sign_headers =  LIST
 .endif
 .endif

+.endif

 
 # ----- Retry -----
 
 
 # ----- Retry -----