Testsuite: fix macro conflict (X vs. HEADERS_MAXSIZE)

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 4a014cee1139092464bd4ac765dd0aea4afbacf8..2eaf01ee3e661070ff9518388be7eba3ee037bbe 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -1,4 +1,8 @@
 # Exim test configuration 0900
+SERVER=
+Y=
+LIST=
+ALLOW=
 
 exim_path = EXIM_PATH
 keep_environment =
@@ -8,21 +12,26 @@ 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 {Y}{tls} {*}}
 
 
 # ----- Main settings -----
 
-domainlist local_domains = @
+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
-message_id_header_domain = ${if eq{0}{0}{some.domain}}
-message_id_header_text = ${if eq{0}{0}{a@b[c]}}
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
+log_selector = +received_recipients
 
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+ALLOW
 
 # ----- ACL -----
 
@@ -33,6 +42,10 @@ 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
@@ -42,6 +55,12 @@ check_data:
 
 begin routers
 
+to_server:
+  driver = accept
+  condition =  ${if !eq {SERVER}{server}}
+  transport =  remote_smtp${if eq {OPT}{dkim} {_dkim}}
+  errors_to =  ""
+
 fail_remote_domains:
   driver = redirect
   domains = ! +local_domains
@@ -68,4 +87,33 @@ local_delivery:
                  X-received-count: $received_count"
   return_path_add
 
+remote_smtp:
+  driver = smtp
+  hosts =      127.0.0.1
+  port =       PORT_S
+  allow_localhost
+  command_timeout = 2s
+  final_timeout = 2s
+
+remote_smtp_dkim:
+  driver = smtp
+  hosts =      127.0.0.1
+  port =       PORT_S
+  allow_localhost
+  command_timeout = 2s
+  final_timeout = 2s
+
+.ifdef OPT
+  dkim_domain =                test.ex
+  dkim_selector =      sel
+  dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
+.ifndef HEADERS_MAXSIZE
+  dkim_sign_headers =  LIST
+.endif
+.endif
+
+# ----- Retry -----
+
+begin retry
+* * F,30m,5m;
 # End