Fix "-bP smtp_receive_timeout". Bug 2384

[users/heiko/exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 3235f1ee7f51137f9a3ac30e4b86cd2dd75af49f..caf17be81bfc7751e9bafee102f49931ad1310df 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -1,7 +1,8 @@
 # Exim test configuration 0900
 SERVER=
-X=
-OPT=
+SRV=
+LIST=
+ALLOW=
 
 exim_path = EXIM_PATH
 keep_environment =
@@ -11,20 +12,39 @@ log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
-tls_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 -----
 
+primary_hostname = testhost.test.ex
 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = check_recipient
+acl_smtp_data_prdr = check_prdr
 acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
 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}
+.endif
 
+ALLOW
 
 # ----- ACL -----
 
@@ -35,11 +55,14 @@ check_recipient:
   accept domains = +local_domains
   deny   message = relay not permitted
 
+check_prdr:
+  accept local_parts = good
+  deny
+
 check_data:
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 
-
 # ----- Routers -----
 
 begin routers
@@ -47,7 +70,7 @@ begin routers
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}
-  transport =  remote_smtp${if eq {X}{dkim} {_dkim}}
+  transport =  remote_smtp${if eq {SRV}{dkim} {_dkim}}
   errors_to =  ""
 
 fail_remote_domains:
@@ -92,11 +115,15 @@ remote_smtp_dkim:
   command_timeout = 2s
   final_timeout = 2s
 
+.ifdef _HAVE_DKIM
+.ifdef SRV
   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE
-  dkim_sign_headers =  OPT
+  dkim_sign_headers =  LIST
+.endif
+.endif
 .endif
 
 # ----- Retry -----