Sync 4.next from master

2 files changed, 58 insertions, 0 deletions

diff --git a/test/confs/0570 b/test/confs/0570
index 1c2ca0a25..962e76bb0 100644
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -36,5 +36,6 @@ smtp:
   driver = smtp
   port = PORT_D
   OPTION
+  max_parallel = 1
 
 # End
diff --git a/test/confs/4510 b/test/confs/4510
new file mode 100644
index 000000000..42c58aac5
--- /dev/null
+++ b/test/confs/4510
@@ -0,0 +1,57 @@
+# Exim test configuration 4510
+
+SERVER=
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+acl_smtp_data_prdr = accept local_parts = okuser
+
+prdr_enable
+
+# ----- Routers
+
+begin routers
+
+client:
+  driver = accept
+  condition = ${if eq {SERVER}{server}{no}{yes}}
+  transport = send_to_server
+
+server_dump:
+  driver = redirect
+  senders = ! :
+  data = :blackhole:
+
+server_store:
+  driver = accept
+  transport = store
+
+# ----- Transports
+
+begin transports
+
+store:
+  driver = appendfile
+  file = DIR/test-mail/store
+  return_path_add
+  user = CALLER
+
+send_to_server:
+  driver = smtp
+  allow_localhost
+  hosts = HOSTIPV4
+  port = PORT_D
+
+  dkim_domain =		${if def:sender_address_local_part {test.ex}}
+  dkim_selector =	sel
+  dkim_private_key =	DIR/aux-fixed/dkim/dkim.private
+  dkim_sign_headers =	From
+
+# End