Merge branch 'master' into 4.next

7 files changed, 140 insertions, 1 deletions

diff --git a/test/confs/0001 b/test/confs/0001
index 2b53c0942..5350ba463 100644
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -38,6 +38,7 @@ bounce_return_body = false
 no_bounce_return_message
 return_size_limit = 12K
 bounce_return_size_limit = 10K
+bounce_return_linesize_limit = 997
 callout_domain_negative_expire = 1h
 callout_domain_positive_expire = 1d
 callout_negative_expire = 5h
diff --git a/test/confs/0041 b/test/confs/0041
index 51cba04ac..ec1067584 100644
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -12,6 +12,7 @@ tls_advertise_hosts =
 
 domainlist local_domains = test.ex
 
+acl_smtp_vrfy = check_vrfy
 acl_smtp_expn = check_expn
 qualify_domain = test.ex
 no_write_rejectlog
@@ -21,6 +22,10 @@ no_write_rejectlog
 
 begin acl
 
+check_vrfy:
+  deny	 local_parts = hardfail
+         message = 599 custom reject
+
 check_expn:
   accept hosts = 2.2.2.2
 
diff --git a/test/confs/0572 b/test/confs/0572
index 4af051ca9..2cce49c38 120000..100644
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -1 +1,47 @@
-4020
\ No newline at end of file
+# Exim test configuration 0572
+
+OPT =
+
+exim_path = EXIM_PATH
+hide host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+tls_advertise_hosts =
+
+# ----- Main settings -----
+
+log_selector = +outgoing_port
+
+domainlist local_domains = test.ex : *.test.ex
+acl_smtp_rcpt = accept
+
+
+# ----- Routers -----
+
+begin routers
+
+my_main_router:
+  driver = manualroute
+  route_list = * 127.0.0.1
+  self = send
+  transport = my_smtp
+  debug_print = router_name <$router_name>
+  no_more
+
+
+# ----- Transports -----
+
+begin transports
+
+my_smtp:
+  driver = smtp
+  interface = HOSTIPV4
+  port = PORT_S
+  hide socks_proxy = 127.0.0.1 port=PORT_D OPT
+  debug_print = transport_name <$transport_name>
+
+
+# End
diff --git a/test/confs/0573 b/test/confs/0573
new file mode 100644
index 000000000..c3c7a6bea
--- /dev/null
+++ b/test/confs/0573
@@ -0,0 +1,37 @@
+# Exim test configuration 0573
+
+exim_path = EXIM_PATH
+hide host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+tls_advertise_hosts =
+
+# ----- Main settings -----
+
+trusted_users = CALLER
+bounce_return_linesize_limit = 20
+acl_smtp_rcpt = accept
+
+
+# ----- Routers -----
+
+begin routers
+
+my_main_router:
+  driver = accept
+  domains = myhost.test.ex
+  transport = t1
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
+# End
diff --git a/test/confs/2002 b/test/confs/2002
index 7299122e8..76e6f1eec 100644
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -64,6 +64,7 @@ check_recipient:
 	  logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
 	  logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}
 	  logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}
+	  logwrite =  der_b64 ${base64:$tls_in_peercert}
 
 
 # ----- Routers -----
diff --git a/test/confs/2102 b/test/confs/2102
index 804a846bf..1de92e962 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -68,6 +68,7 @@ check_recipient:
 	  logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
 	  logwrite =  sha1   fingerprint ${sha1:$tls_in_peercert}
 	  logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}
+	  logwrite =  der_b64 ${base64:$tls_in_peercert}
 
 
 # ----- Routers -----
diff --git a/test/confs/4503 b/test/confs/4503
new file mode 100644
index 000000000..ddd87d0fa
--- /dev/null
+++ b/test/confs/4503
@@ -0,0 +1,48 @@
+# Exim test configuration 4503
+
+SERVER=
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/SERVER%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+tls_advertise_hosts =
+
+# ----- Main settings -----
+
+log_selector = +outgoing_port
+acl_smtp_rcpt = accept
+acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length
+
+# ----- Routers
+
+begin routers
+
+server_dump:
+  driver = redirect
+  condition = ${if eq {SERVER}{server}{yes}{no}}
+  data = :blackhole:
+
+client:
+  driver = accept
+  transport = send_to_server
+
+# ----- Transports
+
+begin transports
+
+send_to_server:
+  driver = smtp
+  allow_localhost
+  hosts = HOSTIPV4
+  port = PORT_D
+
+  dkim_domain =		test.ex
+  dkim_selector =	sel
+  dkim_private_key =	DIR/aux-fixed/dkim/dkim.private
+  dkim_sign_headers =	From
+
+# End