Gitweb:
https://git.exim.org/exim.git/commitdiff/c2decce2cb31c21601da988ef6ef02bec9073bdd
Commit: c2decce2cb31c21601da988ef6ef02bec9073bdd
Parent: 90e0b2485d19eea5e93b5adad2fbcce5fc48a237
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Jan 20 20:44:21 2021 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Jan 21 12:20:27 2021 +0000
Testsuite: TLS client testcase consolidation
---
test/confs/0900 | 7 +-
test/confs/{2008 => 1150} | 12 +-
test/confs/{1103 => 1151} | 2 +-
test/confs/{2007 => 1152} | 15 +-
test/confs/{2009 => 1153} | 2 +-
test/confs/{2113 => 1157} | 4 +-
test/confs/{2016 => 1158} | 2 +-
test/confs/{2117 => 1159} | 4 +-
test/confs/{2021 => 1161} | 2 +-
test/confs/{2138 => 1163} | 4 +-
test/confs/{2151 => 1164} | 2 +-
test/confs/{2091 => 1165} | 0
test/confs/2013 | 74 ------
test/confs/2017 | 69 -----
test/confs/2033 | 4 +-
test/confs/2038 | 64 -----
test/confs/2051 | 1 -
test/confs/2107 | 66 -----
test/confs/2108 | 84 ------
test/confs/2109 | 61 -----
test/confs/2116 | 43 ---
test/confs/2121 | 44 ---
test/confs/2133 | 5 +-
test/confs/2191 | 1 -
test/log/{2008 => 1150} | 8 +-
test/log/{1103 => 1151} | 0
test/log/{2007 => 1152} | 2 +-
test/log/{2009 => 1153} | 0
test/log/{2013 => 1157} | 10 +-
test/log/{2016 => 1158} | 2 +-
test/log/{2017 => 1159} | 4 +-
test/log/{2021 => 1161} | 0
test/log/{2038 => 1163} | 4 +-
test/log/1164 | 2 +
test/log/{2091 => 1165} | 2 +-
test/log/2033 | 20 +-
test/log/2051 | 2 -
test/log/2107 | 11 -
test/log/2108 | 31 ---
test/log/2109 | 10 -
test/log/2113 | 69 -----
test/log/2116 | 2 -
test/log/2117 | 19 --
test/log/2121 | 10 -
test/log/2138 | 41 ---
test/log/2151 | 2 -
test/log/2191 | 9 -
test/mail/{2008.CALLER => 1150.CALLER} | 0
test/mail/{2008.abcd => 1150.abcd} | 0
test/mail/{2008.xyz => 1150.xyz} | 0
test/mail/{2013.usera => 1157.usera} | 0
test/mail/{2013.userb => 1157.userb} | 0
test/mail/{2013.userc => 1157.userc} | 0
test/mail/{2013.userx => 1157.userx} | 0
test/mail/{2013.usery => 1157.usery} | 0
test/mail/{2013.userz => 1157.userz} | 0
test/mail/{2017.userx => 1159.userx} | 0
test/mail/{2038.userx0 => 1163.userx0} | 0
test/mail/{2038.userx1 => 1163.userx1} | 0
test/mail/{2038.usery0 => 1163.usery0} | 0
test/mail/{2038.usery1 => 1163.usery1} | 0
test/mail/{2038.userz0 => 1163.userz0} | 0
test/mail/{2038.userz1 => 1163.userz1} | 0
test/mail/2108.CALLER | 34 ---
test/mail/2108.abcd | 17 --
test/mail/2108.xyz | 16 --
test/mail/2113.usera | 18 --
test/mail/2113.userb | 18 --
test/mail/2113.userc | 18 --
test/mail/2113.userx | 18 --
test/mail/2113.usery | 18 --
test/mail/2113.userz | 18 --
test/mail/2117.userx | 36 ---
test/mail/2138.userx0 | 17 --
test/mail/2138.userx1 | 17 --
test/mail/2138.usery0 | 17 --
test/mail/2138.usery1 | 17 --
test/mail/2138.userz0 | 17 --
test/mail/2138.userz1 | 17 --
...2013.10HmbM-0005vi-00 => 1157.10HmbM-0005vi-00} | 0
...2013.10HmbN-0005vi-00 => 1157.10HmbN-0005vi-00} | 0
...2013.10HmbO-0005vi-00 => 1157.10HmbO-0005vi-00} | 0
test/msglog/2113.10HmbM-0005vi-00 | 1 -
test/msglog/2113.10HmbN-0005vi-00 | 1 -
test/msglog/2113.10HmbO-0005vi-00 | 1 -
test/rejectlog/{2009 => 1153} | 0
test/rejectlog/2109 | 3 -
test/runtest | 2 +
.../{2000-GnuTLS/2008 => 1100-Basic-TLS/1150} | 0
test/scripts/1100-Basic-TLS/{1103 => 1151} | 0
.../{2000-GnuTLS/2007 => 1100-Basic-TLS/1152} | 0
.../{2000-GnuTLS/2009 => 1100-Basic-TLS/1153} | 0
.../{2000-GnuTLS/2013 => 1100-Basic-TLS/1157} | 0
.../{2000-GnuTLS/2016 => 1100-Basic-TLS/1158} | 0
.../{2000-GnuTLS/2017 => 1100-Basic-TLS/1159} | 0
.../{2000-GnuTLS/2021 => 1100-Basic-TLS/1161} | 0
.../{2000-GnuTLS/2038 => 1100-Basic-TLS/1163} | 0
.../{2100-OpenSSL/2151 => 1100-Basic-TLS/1164} | 0
.../{2000-GnuTLS/2091 => 1100-Basic-TLS/1165} | 0
test/scripts/2000-GnuTLS/2033 | 6 +-
test/scripts/2000-GnuTLS/2051 | 1 -
test/scripts/2100-OpenSSL/2107 | 10 -
test/scripts/2100-OpenSSL/2108 | 14 -
test/scripts/2100-OpenSSL/2109 | 10 -
test/scripts/2100-OpenSSL/2113 | 51 ----
test/scripts/2100-OpenSSL/2116 | 15 --
test/scripts/2100-OpenSSL/2117 | 14 -
test/scripts/2100-OpenSSL/2121 | 52 ----
test/scripts/2100-OpenSSL/2138 | 17 --
test/scripts/2100-OpenSSL/2191 | 8 -
test/stderr/{2008 => 1150} | 8 +-
test/stderr/{2113 => 1157} | 10 +-
test/stderr/2013 | 296 ---------------------
test/stderr/2108 | 115 --------
test/stdout/{2016 => 1158} | 0
test/stdout/{2021 => 1161} | 0
test/stdout/2116 | 13 -
test/stdout/2121 | 57 ----
118 files changed, 82 insertions(+), 1768 deletions(-)
diff --git a/test/confs/0900 b/test/confs/0900
index df1540c..ffce9e8 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -43,8 +43,7 @@ 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 = DIR/aux-fixed/cert1
.endif
ALLOW
@@ -107,6 +106,8 @@ remote_smtp:
hosts = 127.0.0.1
port = PORT_S
hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
allow_localhost
command_timeout = 2s
final_timeout = 2s
@@ -116,6 +117,8 @@ remote_smtp_dkim:
hosts = 127.0.0.1
port = PORT_S
hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
allow_localhost
command_timeout = 2s
final_timeout = 2s
diff --git a/test/confs/2008 b/test/confs/1150
similarity index 84%
rename from test/confs/2008
rename to test/confs/1150
index 0fd5186..b98c8dc 100644
--- a/test/confs/2008
+++ b/test/confs/1150
@@ -1,4 +1,4 @@
-# Exim test configuration 2008
+# Exim test configuration 1150
SERVER =
@@ -12,16 +12,12 @@ primary_hostname = myhost.test.ex
domainlist local_domains = test.ex : *.test.ex
acl_smtp_rcpt = check_recipient
-log_selector = +tls_peerdn
queue_only
queue_run_in_order
remote_max_parallel = 1
tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1
# ------ ACL ------
@@ -66,6 +62,8 @@ send_to_server1:
port = PORT_D
hosts_try_fastopen = :
helo_data = helo.data.changed
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
send_to_server2:
driver = smtp
@@ -73,6 +71,8 @@ send_to_server2:
hosts = HOSTIPV4
port = PORT_D
hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
# ----- Retry -----
diff --git a/test/confs/1103 b/test/confs/1151
similarity index 95%
rename from test/confs/1103
rename to test/confs/1151
index 52f471b..4729c92 100644
--- a/test/confs/1103
+++ b/test/confs/1151
@@ -1,4 +1,4 @@
-# Exim test configuration 1103
+# Exim test configuration 1151
.include DIR/aux-var/tls_conf_prefix
diff --git a/test/confs/2007 b/test/confs/1152
similarity index 77%
rename from test/confs/2007
rename to test/confs/1152
index db46a6c..eadea0a 100644
--- a/test/confs/2007
+++ b/test/confs/1152
@@ -1,4 +1,4 @@
-# Exim test configuration 2007
+# Exim test configuration 1152
SERVER =
@@ -10,18 +10,17 @@ primary_hostname = myhost.test.ex
acl_smtp_rcpt = accept
-log_selector = +smtp_confirmation+tls_peerdn
+log_selector = +smtp_confirmation
queue_only
queue_run_in_order
tls_advertise_hosts = *
+.ifdef _HAVE_GNUTLS
tls_require_ciphers = NORMAL:!DHE-RSA:!DHE-DSS:!ECDHE-RSA:!ECDHE-ECDSA:!ECDHE-PSK
+.endif
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1
# ----- Routers -----
@@ -56,6 +55,8 @@ send_to_server1:
hosts = 127.0.0.1
port = PORT_D
hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
send_to_server2:
driver = smtp
@@ -63,5 +64,7 @@ send_to_server2:
hosts = HOSTIPV4
port = PORT_D
hosts_try_fastopen = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames =
# End
diff --git a/test/confs/2009 b/test/confs/1153
similarity index 96%
rename from test/confs/2009
rename to test/confs/1153
index 21f9f26..13e2c40 100644
--- a/test/confs/2009
+++ b/test/confs/1153
@@ -1,4 +1,4 @@
-# Exim test configuration 2009
+# Exim test configuration 1153
SERVER =
diff --git a/test/confs/2113 b/test/confs/1157
similarity index 91%
rename from test/confs/2113
rename to test/confs/1157
index b992747..1b12a5f 100644
--- a/test/confs/2113
+++ b/test/confs/1157
@@ -1,4 +1,4 @@
-# Exim test configuration 2113
+# Exim test configuration 1157
SERVER =
PEX = :
@@ -11,7 +11,7 @@ primary_hostname = myhost.test.ex
acl_smtp_rcpt = accept
-log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
+log_selector = +smtp_connection+incoming_port+received_recipients
queue_only
queue_run_in_order
diff --git a/test/confs/2016 b/test/confs/1158
similarity index 93%
rename from test/confs/2016
rename to test/confs/1158
index ead3a90..b4a5f97 100644
--- a/test/confs/2016
+++ b/test/confs/1158
@@ -1,4 +1,4 @@
-# Exim test configuration 2016
+# Exim test configuration 1158
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/2117 b/test/confs/1159
similarity index 94%
rename from test/confs/2117
rename to test/confs/1159
index 16429f1..a549a9f 100644
--- a/test/confs/2117
+++ b/test/confs/1159
@@ -1,4 +1,4 @@
-# Exim test configuration 2117
+# Exim test configuration 1159
SERVER =
@@ -10,8 +10,6 @@ primary_hostname = myhost.test.ex
acl_smtp_rcpt = accept
-log_selector = +tls_peerdn
-
queue_only
queue_run_in_order
diff --git a/test/confs/2021 b/test/confs/1161
similarity index 93%
rename from test/confs/2021
rename to test/confs/1161
index a7e89f8..ae7c161 100644
--- a/test/confs/2021
+++ b/test/confs/1161
@@ -1,4 +1,4 @@
-# Exim test configuration 2021
+# Exim test configuration 1161
REQUIRE=#
TRYCLEAR=#
diff --git a/test/confs/2138 b/test/confs/1163
similarity index 90%
rename from test/confs/2138
rename to test/confs/1163
index c255373..f9d1ab1 100644
--- a/test/confs/2138
+++ b/test/confs/1163
@@ -1,4 +1,4 @@
-# Exim test configuration 2135
+# Exim test configuration 1163
SERVER =
@@ -10,7 +10,7 @@ primary_hostname = myhost.test.ex
acl_smtp_rcpt = accept
-log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
+log_selector = +smtp_connection+incoming_port+received_recipients
queue_only
queue_run_in_order
diff --git a/test/confs/2151 b/test/confs/1164
similarity index 96%
rename from test/confs/2151
rename to test/confs/1164
index 1e40a83..9c13ad5 100644
--- a/test/confs/2151
+++ b/test/confs/1164
@@ -1,4 +1,4 @@
-# Exim test configuration 2151
+# Exim test configuration 1164
.include DIR/aux-var/tls_conf_prefix
diff --git a/test/confs/2091 b/test/confs/1165
similarity index 100%
rename from test/confs/2091
rename to test/confs/1165
diff --git a/test/confs/2013 b/test/confs/2013
deleted file mode 100644
index d81f160..0000000
--- a/test/confs/2013
+++ /dev/null
@@ -1,74 +0,0 @@
-# Exim test configuration 2013
-
-SERVER =
-PEX = :
-
-.include DIR/aux-var/tls_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-
-log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
-
-queue_only
-queue_run_in_order
-
-smtp_accept_max_nonmail = 0
-
-tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
-
-# ----- Routers -----
-
-begin routers
-
-.ifdef REQUIRE
-cl_override:
- driver = manualroute
- route_data = HOSTIPV4
- retry_use_local_part
- transport = send_to_server
- self = send
-.endif
-
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- retry_use_local_part
- transport = send_to_server
-
-server:
- driver = accept
- retry_use_local_part
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/${bless:$local_part}
- headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
- user = CALLER
-
-send_to_server:
- driver = smtp
- allow_localhost
- hosts_override
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- hosts_noproxy_tls = PEX
- tls_try_verify_hosts = :
-
-# End
diff --git a/test/confs/2017 b/test/confs/2017
deleted file mode 100644
index 01612ef..0000000
--- a/test/confs/2017
+++ /dev/null
@@ -1,69 +0,0 @@
-# Exim test configuration 2017
-
-SERVER =
-
-.include DIR/aux-var/tls_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-
-log_selector = +tls_peerdn
-
-queue_only
-queue_run_in_order
-
-tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- retry_use_local_part
- transport = send_to_server
-
-server:
- driver = accept
- retry_use_local_part
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/${bless:$local_part}
- headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
- user = CALLER
-
-send_to_server:
- driver = smtp
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- hosts_nopass_tls = *
-
-
-# ----- Retry -----
-
-
-begin retry
-
-* * F,5d,10s
-
-
-# End
diff --git a/test/confs/2033 b/test/confs/2033
index 15e632a..8fa51d0 100644
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -1,4 +1,4 @@
-# Exim test configuration 2033
+# Exim test configuration 1162
# TLS client: verify certificate from server - name-fails
SERVER=
@@ -81,7 +81,7 @@ client_r:
client_s:
driver = accept
- local_parts = users
+ local_parts = user_s
retry_use_local_part
transport = send_to_server_req_passname
diff --git a/test/confs/2038 b/test/confs/2038
deleted file mode 100644
index 677bc9e..0000000
--- a/test/confs/2038
+++ /dev/null
@@ -1,64 +0,0 @@
-# Exim test configuration 2035
-
-SERVER =
-
-.include DIR/aux-var/tls_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-
-log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients
-
-queue_only
-queue_run_in_order
-remote_max_parallel = 1
-
-smtp_accept_max_nonmail = 0
-
-tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = manualroute
- condition = ${if eq {SERVER}{server}{no}{yes}}
- route_data = 127.0.0.1
- self = send
- retry_use_local_part
- transport = send_to_server
-
-server:
- driver = accept
- retry_use_local_part
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/${bless:$local_part}
- headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
- user = CALLER
-
-send_to_server:
- driver = smtp
- allow_localhost
- hosts_noproxy_tls = :
- port = PORT_D
- max_rcpt = 1
-
-# End
diff --git a/test/confs/2051 b/test/confs/2051
deleted file mode 120000
index cde0a73..0000000
--- a/test/confs/2051
+++ /dev/null
@@ -1 +0,0 @@
-2151
\ No newline at end of file
diff --git a/test/confs/2107 b/test/confs/2107
deleted file mode 100644
index 1f96800..0000000
--- a/test/confs/2107
+++ /dev/null
@@ -1,66 +0,0 @@
-# Exim test configuration 2107
-
-SERVER =
-
-.include DIR/aux-var/tls_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-
-log_selector = +smtp_confirmation+tls_peerdn
-
-queue_only
-queue_run_in_order
-
-tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- retry_use_local_part
- transport = send_to_server${if eq{$local_part}{abcd}{2}{1}}
-
-server:
- driver = accept
- retry_use_local_part
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/${bless:$local_part}
- headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
- user = CALLER
-
-send_to_server1:
- driver = smtp
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
-
-send_to_server2:
- driver = smtp
- allow_localhost
- hosts = HOSTIPV4
- port = PORT_D
- hosts_try_fastopen = :
-
-# End
diff --git a/test/confs/2108 b/test/confs/2108
deleted file mode 100644
index c9720e4..0000000
--- a/test/confs/2108
+++ /dev/null
@@ -1,84 +0,0 @@
-# Exim test configuration 2108
-
-SERVER =
-
-.include DIR/aux-var/tls_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-domainlist local_domains = test.ex : *.test.ex
-
-acl_smtp_rcpt = check_recipient
-log_selector = +tls_peerdn
-queue_only
-queue_run_in_order
-remote_max_parallel = 1
-
-tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
-# ------ ACL ------
-
-begin acl
-
-check_recipient:
- accept domains = +local_domains
- deny message = relay not permitted
-
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- retry_use_local_part
- transport = send_to_server${if eq{$local_part}{abcd}{2}{1}}
-
-server:
- driver = accept
- retry_use_local_part
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/${bless:$local_part}
- headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
- user = CALLER
-
-send_to_server1:
- driver = smtp
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- helo_data = helo.data.changed
-
-send_to_server2:
- driver = smtp
- allow_localhost
- hosts = HOSTIPV4
- port = PORT_D
- hosts_try_fastopen = :
-
-
-# ----- Retry -----
-
-
-begin retry
-
-* * F,5d,10s
-
-
-# End
diff --git a/test/confs/2109 b/test/confs/2109
deleted file mode 100644
index 3f1465f..0000000
--- a/test/confs/2109
+++ /dev/null
@@ -1,61 +0,0 @@
-# Exim test configuration 2109
-
-SERVER =
-
-.include DIR/aux-var/tls_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = check_recipient
-hostlist tls_hosts = 127.0.0.1
-
-queue_only
-queue_run_in_order
-
-tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
-
-
-# ----- ACL -----
-
-begin acl
-
-check_recipient:
- deny hosts = +tls_hosts
- message = encryption required
- !encrypted = *
- accept domains = +local_domains
- deny message = relay not permitted
-
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- retry_use_local_part
- transport = send_to_server
-
-
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
- driver = smtp
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- hosts_avoid_tls = 127.0.0.1
-
-# End
diff --git a/test/confs/2116 b/test/confs/2116
deleted file mode 100644
index 77a6712..0000000
--- a/test/confs/2116
+++ /dev/null
@@ -1,43 +0,0 @@
-# Exim test configuration 2116
-
-.include DIR/aux-var/std_conf_prefix
-
-
-# ----- Main settings -----
-
-qualify_domain = test.ex
-
-
-# ----- Routers -----
-
-begin routers
-
-others:
- driver = manualroute
- route_list = * 127.0.0.1 byname
- self = send
- transport = smtp
- no_more
-
-
-# ----- Transports -----
-
-begin transports
-
-smtp:
- driver = smtp
- command_timeout = 1s
- port = PORT_S
- hosts_try_fastopen = :
- hosts_require_tls = 127.0.0.1
-
-
-# ----- Retry -----
-
-
-begin retry
-
-* * F,5d,1d
-
-
-# End
diff --git a/test/confs/2121 b/test/confs/2121
deleted file mode 100644
index 6dcaa05..0000000
--- a/test/confs/2121
+++ /dev/null
@@ -1,44 +0,0 @@
-# Exim test configuration 2121
-
-REQUIRE=#
-TRYCLEAR=#
-
-.include DIR/aux-var/std_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = accept
- transport = send_to_server
-
-
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
- driver = smtp
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_S
- hosts_try_fastopen = :
- REQUIRE
- TRYCLEAR
-
-
-# ----- Retry -----
-
-
-begin retry
-
-* * F,5d,10s
-
-
-# End
diff --git a/test/confs/2133 b/test/confs/2133
index 463e614..8fa51d0 100644
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -1,4 +1,4 @@
-# Exim test configuration 2133
+# Exim test configuration 1162
# TLS client: verify certificate from server - name-fails
SERVER=
@@ -91,7 +91,6 @@ client_t:
retry_use_local_part
transport = send_to_server_req_failcarryon
-
# ----- Transports -----
begin transports
@@ -181,6 +180,8 @@ send_to_server_req_passname:
tls_verify_cert_hostnames = *
tls_verify_hosts = *
+# this will fail to verify the cert name but carry on (try-verify mode)
+# fail because the cert is "server1.example.com" and the test system is something else
send_to_server_req_failcarryon:
driver = smtp
allow_localhost
diff --git a/test/confs/2191 b/test/confs/2191
deleted file mode 120000
index 1bb9871..0000000
--- a/test/confs/2191
+++ /dev/null
@@ -1 +0,0 @@
-0900
\ No newline at end of file
diff --git a/test/log/2008 b/test/log/1150
similarity index 82%
rename from test/log/2008
rename to test/log/1150
index 1f8c15c..00415d3 100644
--- a/test/log/2008
+++ b/test/log/1150
@@ -1,11 +1,11 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@??? R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@??? R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/1103 b/test/log/1151
similarity index 100%
rename from test/log/1103
rename to test/log/1151
diff --git a/test/log/2007 b/test/log/1152
similarity index 86%
rename from test/log/2007
rename to test/log/1152
index dfcb3c3..ae8d0d1 100644
--- a/test/log/2007
+++ b/test/log/1152
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2009 b/test/log/1153
similarity index 100%
rename from test/log/2009
rename to test/log/1153
diff --git a/test/log/2013 b/test/log/1157
similarity index 92%
rename from test/log/2013
rename to test/log/1157
index d23565e..7c8e6e8 100644
--- a/test/log/2013
+++ b/test/log/1157
@@ -2,7 +2,7 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for usery@???
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userz@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
@@ -13,7 +13,7 @@
1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userb@???
1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userc@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
+1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00"
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
@@ -24,11 +24,11 @@
1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for usery@???
1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userz@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00"
1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbL-0005vi-00 => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
+1999-03-02 09:44:33 10HmbL-0005vi-00 => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00"
1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbK-0005vi-00 => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00"
+1999-03-02 09:44:33 10HmbK-0005vi-00 => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00"
1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qqf
diff --git a/test/log/2016 b/test/log/1158
similarity index 61%
rename from test/log/2016
rename to test/log/1158
index 039002b..876c8b2 100644
--- a/test/log/2016
+++ b/test/log/1158
@@ -1,2 +1,2 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (gnutls_handshake): timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (tls lib connect fn): timed out
diff --git a/test/log/2017 b/test/log/1159
similarity index 87%
rename from test/log/2017
rename to test/log/1159
index 738e662..94040ba 100644
--- a/test/log/2017
+++ b/test/log/1159
@@ -1,9 +1,9 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qqf
diff --git a/test/log/2021 b/test/log/1161
similarity index 100%
rename from test/log/2021
rename to test/log/1161
diff --git a/test/log/2038 b/test/log/1163
similarity index 95%
rename from test/log/2038
rename to test/log/1163
index cd177be..63f6c3f 100644
--- a/test/log/2038
+++ b/test/log/1163
@@ -2,8 +2,8 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for usery0@??? usery1@???
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userz0@??? userz1@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz0@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz1@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbD-0005vi-00"
diff --git a/test/log/1164 b/test/log/1164
new file mode 100644
index 0000000..6b522e9
--- /dev/null
+++ b/test/log/1164
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 TLS session: (tls lib connect fn): timed out: callout unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= s1@??? U=CALLER P=local-esmtp S=sss
diff --git a/test/log/2091 b/test/log/1165
similarity index 87%
rename from test/log/2091
rename to test/log/1165
index 417da83..e35fd54 100644
--- a/test/log/2091
+++ b/test/log/1165
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= this-user@??? U=this-user P=local S=sss for other-user@???
-1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
******** SERVER ********
diff --git a/test/log/2033 b/test/log/2033
index d0a860e..8757949 100644
--- a/test/log/2033
+++ b/test/log/2033
@@ -1,19 +1,25 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): delivering unencrypted to H=the.local.host.name [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userr@??? R=client_r T=send_to_server_req_failname H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): certificate invalid: delivering unencrypted to H=the.local.host.name [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@??? R=client_q T=send_to_server_req_fail H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbB-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => users@??? R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session: (certificate verification failed): delivering unencrypted to H=the.local.host.name [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userr@??? R=client_r T=send_to_server_req_failname H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbC-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => usert@??? R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => user_s@??? R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => usert@??? R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@???
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@???
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmbA-0005vi-00@???
diff --git a/test/log/2051 b/test/log/2051
deleted file mode 100644
index e59a281..0000000
--- a/test/log/2051
+++ /dev/null
@@ -1,2 +0,0 @@
-1999-03-02 09:44:33 TLS session: (gnutls_handshake): timed out: callout unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= s1@??? U=CALLER P=local-esmtp S=sss
diff --git a/test/log/2107 b/test/log/2107
deleted file mode 100644
index 05b44d0..0000000
--- a/test/log/2107
+++ /dev/null
@@ -1,11 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@???
diff --git a/test/log/2108 b/test/log/2108
deleted file mode 100644
index 4ae01f0..0000000
--- a/test/log/2108
+++ /dev/null
@@ -1,31 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaY-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaY-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="ip4.ip4.ip4.ip4"
-1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@??? R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbA-0005vi-00 => xyz <xyz@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 => abcd <abcd@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2109 b/test/log/2109
deleted file mode 100644
index 1e0ec19..0000000
--- a/test/log/2109
+++ /dev/null
@@ -1,10 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 encryption required
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@???> rejected RCPT <userx@???>: encryption required
diff --git a/test/log/2113 b/test/log/2113
deleted file mode 100644
index aaa72e8..0000000
--- a/test/log/2113
+++ /dev/null
@@ -1,69 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userx@???
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for usery@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userz@???
-1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for usera@???
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userb@???
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userc@???
-1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
-1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
-1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 => userb@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
-1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userx@???
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for usery@???
-1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userz@???
-1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
-1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbL-0005vi-00 => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
-1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbK-0005vi-00 => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00"
-1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qqf
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@??? for userx@???
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@??? for userz@???
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@??? for usery@???
-1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 => userz <userz@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 => usery <usery@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@??? for usera@???
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@??? for userc@???
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbE-0005vi-00@??? for userb@???
-1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbG-0005vi-00 => usera <usera@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbH-0005vi-00 => userc <userc@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbI-0005vi-00 => userb <userb@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@??? for userx@???
-1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@??? for userz@???
-1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@??? for usery@???
-1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1113 closed by QUIT
diff --git a/test/log/2116 b/test/log/2116
deleted file mode 100644
index 32596c2..0000000
--- a/test/log/2116
+++ /dev/null
@@ -1,2 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): timed out
diff --git a/test/log/2117 b/test/log/2117
deleted file mode 100644
index 2ecbfec..0000000
--- a/test/log/2117
+++ /dev/null
@@ -1,19 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qqf
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2121 b/test/log/2121
deleted file mode 100644
index 59e8330..0000000
--- a/test/log/2121
+++ /dev/null
@@ -1,10 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed
-1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed
diff --git a/test/log/2138 b/test/log/2138
deleted file mode 100644
index decd0de..0000000
--- a/test/log/2138
+++ /dev/null
@@ -1,41 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userx0@??? userx1@???
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for usery0@??? usery1@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for userz0@??? userz1@???
-1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz0@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz1@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbD-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => usery0@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbE-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 => usery1@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbF-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qqf
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@??? for userx0@???
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 2)
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@??? for userx1@???
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@??? for userz0@???
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@??? for userz1@???
-1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@??? for usery0@???
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@??? for usery1@???
-1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbA-0005vi-00 => userx0 <userx0@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 => userx1 <userx1@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 => userz0 <userz0@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 => userz1 <userz1@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 => usery0 <usery0@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 => usery1 <usery1@???> R=server T=local_delivery
-1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2151 b/test/log/2151
deleted file mode 100644
index a649f43..0000000
--- a/test/log/2151
+++ /dev/null
@@ -1,2 +0,0 @@
-1999-03-02 09:44:33 TLS session: (SSL_connect): timed out: callout unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= s1@??? U=CALLER P=local-esmtp S=sss
diff --git a/test/log/2191 b/test/log/2191
deleted file mode 100644
index 3c3b7ac..0000000
--- a/test/log/2191
+++ /dev/null
@@ -1,9 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= this-user@??? U=this-user P=local S=sss for other-user@???
-1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmaX-0005vi-00@??? for other-user@???
diff --git a/test/mail/2008.CALLER b/test/mail/1150.CALLER
similarity index 100%
rename from test/mail/2008.CALLER
rename to test/mail/1150.CALLER
diff --git a/test/mail/2008.abcd b/test/mail/1150.abcd
similarity index 100%
rename from test/mail/2008.abcd
rename to test/mail/1150.abcd
diff --git a/test/mail/2008.xyz b/test/mail/1150.xyz
similarity index 100%
rename from test/mail/2008.xyz
rename to test/mail/1150.xyz
diff --git a/test/mail/2013.usera b/test/mail/1157.usera
similarity index 100%
rename from test/mail/2013.usera
rename to test/mail/1157.usera
diff --git a/test/mail/2013.userb b/test/mail/1157.userb
similarity index 100%
rename from test/mail/2013.userb
rename to test/mail/1157.userb
diff --git a/test/mail/2013.userc b/test/mail/1157.userc
similarity index 100%
rename from test/mail/2013.userc
rename to test/mail/1157.userc
diff --git a/test/mail/2013.userx b/test/mail/1157.userx
similarity index 100%
rename from test/mail/2013.userx
rename to test/mail/1157.userx
diff --git a/test/mail/2013.usery b/test/mail/1157.usery
similarity index 100%
rename from test/mail/2013.usery
rename to test/mail/1157.usery
diff --git a/test/mail/2013.userz b/test/mail/1157.userz
similarity index 100%
rename from test/mail/2013.userz
rename to test/mail/1157.userz
diff --git a/test/mail/2017.userx b/test/mail/1159.userx
similarity index 100%
rename from test/mail/2017.userx
rename to test/mail/1159.userx
diff --git a/test/mail/2038.userx0 b/test/mail/1163.userx0
similarity index 100%
rename from test/mail/2038.userx0
rename to test/mail/1163.userx0
diff --git a/test/mail/2038.userx1 b/test/mail/1163.userx1
similarity index 100%
rename from test/mail/2038.userx1
rename to test/mail/1163.userx1
diff --git a/test/mail/2038.usery0 b/test/mail/1163.usery0
similarity index 100%
rename from test/mail/2038.usery0
rename to test/mail/1163.usery0
diff --git a/test/mail/2038.usery1 b/test/mail/1163.usery1
similarity index 100%
rename from test/mail/2038.usery1
rename to test/mail/1163.usery1
diff --git a/test/mail/2038.userz0 b/test/mail/1163.userz0
similarity index 100%
rename from test/mail/2038.userz0
rename to test/mail/1163.userz0
diff --git a/test/mail/2038.userz1 b/test/mail/1163.userz1
similarity index 100%
rename from test/mail/2038.userz1
rename to test/mail/1163.userz1
diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER
deleted file mode 100644
index f7669bd..0000000
--- a/test/mail/2108.CALLER
+++ /dev/null
@@ -1,34 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaZ-0005vi-00
- for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-0005vi-00
- for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message. Contains FF: ?
-
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message to two different hosts
-
diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd
deleted file mode 100644
index 8a6aae2..0000000
--- a/test/mail/2108.abcd
+++ /dev/null
@@ -1,17 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbB-0005vi-00
- for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message to two different hosts
-
diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz
deleted file mode 100644
index e304d94..0000000
--- a/test/mail/2108.xyz
+++ /dev/null
@@ -1,16 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message to two different hosts
-
diff --git a/test/mail/2113.usera b/test/mail/2113.usera
deleted file mode 100644
index 8aac112..0000000
--- a/test/mail/2113.usera
+++ /dev/null
@@ -1,18 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbG-0005vi-00
- for usera@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbD-0005vi-00
- for usera@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 1
-
diff --git a/test/mail/2113.userb b/test/mail/2113.userb
deleted file mode 100644
index 0a98cd8..0000000
--- a/test/mail/2113.userb
+++ /dev/null
@@ -1,18 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbI-0005vi-00
- for userb@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbE-0005vi-00
- for userb@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 2
-
diff --git a/test/mail/2113.userc b/test/mail/2113.userc
deleted file mode 100644
index efb32a6..0000000
--- a/test/mail/2113.userc
+++ /dev/null
@@ -1,18 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbH-0005vi-00
- for userc@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbF-0005vi-00
- for userc@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 3
-
diff --git a/test/mail/2113.userx b/test/mail/2113.userx
deleted file mode 100644
index f720f91..0000000
--- a/test/mail/2113.userx
+++ /dev/null
@@ -1,18 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbA-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 1
-
diff --git a/test/mail/2113.usery b/test/mail/2113.usery
deleted file mode 100644
index 32797e1..0000000
--- a/test/mail/2113.usery
+++ /dev/null
@@ -1,18 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbC-0005vi-00
- for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00
- for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 2
-
diff --git a/test/mail/2113.userz b/test/mail/2113.userz
deleted file mode 100644
index 919c86d..0000000
--- a/test/mail/2113.userz
+++ /dev/null
@@ -1,18 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbB-0005vi-00
- for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaZ-0005vi-00
- for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 3
-
diff --git a/test/mail/2117.userx b/test/mail/2117.userx
deleted file mode 100644
index 1a86c2a..0000000
--- a/test/mail/2117.userx
+++ /dev/null
@@ -1,36 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaZ-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 1
-
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbA-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 2
-
diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0
deleted file mode 100644
index 5d80e98..0000000
--- a/test/mail/2138.userx0
+++ /dev/null
@@ -1,17 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbA-0005vi-00
- for userx0@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 1
-
diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1
deleted file mode 100644
index 1acf09c..0000000
--- a/test/mail/2138.userx1
+++ /dev/null
@@ -1,17 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbB-0005vi-00
- for userx1@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 1
-
diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0
deleted file mode 100644
index 6030779..0000000
--- a/test/mail/2138.usery0
+++ /dev/null
@@ -1,17 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbE-0005vi-00
- for usery0@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 2
-
diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1
deleted file mode 100644
index e1b08c6..0000000
--- a/test/mail/2138.usery1
+++ /dev/null
@@ -1,17 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbF-0005vi-00
- for usery1@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 2
-
diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0
deleted file mode 100644
index 9f45587..0000000
--- a/test/mail/2138.userz0
+++ /dev/null
@@ -1,17 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbC-0005vi-00
- for userz0@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 3
-
diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1
deleted file mode 100644
index 17e3991..0000000
--- a/test/mail/2138.userz1
+++ /dev/null
@@ -1,17 +0,0 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
-Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
- (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmbD-0005vi-00
- for userz1@???; Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
-
-Test message 3
-
diff --git a/test/msglog/2013.10HmbM-0005vi-00 b/test/msglog/1157.10HmbM-0005vi-00
similarity index 100%
rename from test/msglog/2013.10HmbM-0005vi-00
rename to test/msglog/1157.10HmbM-0005vi-00
diff --git a/test/msglog/2013.10HmbN-0005vi-00 b/test/msglog/1157.10HmbN-0005vi-00
similarity index 100%
rename from test/msglog/2013.10HmbN-0005vi-00
rename to test/msglog/1157.10HmbN-0005vi-00
diff --git a/test/msglog/2013.10HmbO-0005vi-00 b/test/msglog/1157.10HmbO-0005vi-00
similarity index 100%
rename from test/msglog/2013.10HmbO-0005vi-00
rename to test/msglog/1157.10HmbO-0005vi-00
diff --git a/test/msglog/2113.10HmbM-0005vi-00 b/test/msglog/2113.10HmbM-0005vi-00
deleted file mode 100644
index 70e7075..0000000
--- a/test/msglog/2113.10HmbM-0005vi-00
+++ /dev/null
@@ -1 +0,0 @@
-1999-03-02 09:44:33 Received from CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@???
diff --git a/test/msglog/2113.10HmbN-0005vi-00 b/test/msglog/2113.10HmbN-0005vi-00
deleted file mode 100644
index dbe4dd9..0000000
--- a/test/msglog/2113.10HmbN-0005vi-00
+++ /dev/null
@@ -1 +0,0 @@
-1999-03-02 09:44:33 Received from CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@???
diff --git a/test/msglog/2113.10HmbO-0005vi-00 b/test/msglog/2113.10HmbO-0005vi-00
deleted file mode 100644
index 2a90570..0000000
--- a/test/msglog/2113.10HmbO-0005vi-00
+++ /dev/null
@@ -1 +0,0 @@
-1999-03-02 09:44:33 Received from CALLER@??? H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@???
diff --git a/test/rejectlog/2009 b/test/rejectlog/1153
similarity index 100%
rename from test/rejectlog/2009
rename to test/rejectlog/1153
diff --git a/test/rejectlog/2109 b/test/rejectlog/2109
deleted file mode 100644
index 113f286..0000000
--- a/test/rejectlog/2109
+++ /dev/null
@@ -1,3 +0,0 @@
-
-******** SERVER ********
-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@???> rejected RCPT <userx@???>: encryption required
diff --git a/test/runtest b/test/runtest
index 1e604e1..3234726 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1489,6 +1489,8 @@ RESET_AFTER_EXTRA_LINE_READ:
# Platform differences in errno strings
s/Arg list too long/Argument list too long/;
+
+ s/session: \((SSL_connect|gnutls_handshake)\): timed out/session: (tls lib connect fn): timed out/;
}
# ======== mail ========
diff --git a/test/scripts/2000-GnuTLS/2008 b/test/scripts/1100-Basic-TLS/1150
similarity index 100%
rename from test/scripts/2000-GnuTLS/2008
rename to test/scripts/1100-Basic-TLS/1150
diff --git a/test/scripts/1100-Basic-TLS/1103 b/test/scripts/1100-Basic-TLS/1151
similarity index 100%
rename from test/scripts/1100-Basic-TLS/1103
rename to test/scripts/1100-Basic-TLS/1151
diff --git a/test/scripts/2000-GnuTLS/2007 b/test/scripts/1100-Basic-TLS/1152
similarity index 100%
rename from test/scripts/2000-GnuTLS/2007
rename to test/scripts/1100-Basic-TLS/1152
diff --git a/test/scripts/2000-GnuTLS/2009 b/test/scripts/1100-Basic-TLS/1153
similarity index 100%
rename from test/scripts/2000-GnuTLS/2009
rename to test/scripts/1100-Basic-TLS/1153
diff --git a/test/scripts/2000-GnuTLS/2013 b/test/scripts/1100-Basic-TLS/1157
similarity index 100%
rename from test/scripts/2000-GnuTLS/2013
rename to test/scripts/1100-Basic-TLS/1157
diff --git a/test/scripts/2000-GnuTLS/2016 b/test/scripts/1100-Basic-TLS/1158
similarity index 100%
rename from test/scripts/2000-GnuTLS/2016
rename to test/scripts/1100-Basic-TLS/1158
diff --git a/test/scripts/2000-GnuTLS/2017 b/test/scripts/1100-Basic-TLS/1159
similarity index 100%
rename from test/scripts/2000-GnuTLS/2017
rename to test/scripts/1100-Basic-TLS/1159
diff --git a/test/scripts/2000-GnuTLS/2021 b/test/scripts/1100-Basic-TLS/1161
similarity index 100%
rename from test/scripts/2000-GnuTLS/2021
rename to test/scripts/1100-Basic-TLS/1161
diff --git a/test/scripts/2000-GnuTLS/2038 b/test/scripts/1100-Basic-TLS/1163
similarity index 100%
rename from test/scripts/2000-GnuTLS/2038
rename to test/scripts/1100-Basic-TLS/1163
diff --git a/test/scripts/2100-OpenSSL/2151 b/test/scripts/1100-Basic-TLS/1164
similarity index 100%
rename from test/scripts/2100-OpenSSL/2151
rename to test/scripts/1100-Basic-TLS/1164
diff --git a/test/scripts/2000-GnuTLS/2091 b/test/scripts/1100-Basic-TLS/1165
similarity index 100%
rename from test/scripts/2000-GnuTLS/2091
rename to test/scripts/1100-Basic-TLS/1165
diff --git a/test/scripts/2000-GnuTLS/2033 b/test/scripts/2000-GnuTLS/2033
index f43d18d..1559a77 100644
--- a/test/scripts/2000-GnuTLS/2033
+++ b/test/scripts/2000-GnuTLS/2033
@@ -2,12 +2,16 @@
gnutls
exim -DSERVER=server -bd -oX PORT_D
****
+# this will fail to verify the cert at HOSTIPV4 and fallback to unencrypted
+exim userq@???
+Testing
+****
# this will fail to verify the cert name and fallback to unencrypted
exim userr@???
Testing
****
# this will pass the cert verify including name check
-exim users@???
+exim user_s@???
Testing
****
# this will fail to verify the cert name but carry on (try-verify mode)
diff --git a/test/scripts/2000-GnuTLS/2051 b/test/scripts/2000-GnuTLS/2051
deleted file mode 120000
index ac5066b..0000000
--- a/test/scripts/2000-GnuTLS/2051
+++ /dev/null
@@ -1 +0,0 @@
-../2100-OpenSSL/2151
\ No newline at end of file
diff --git a/test/scripts/2100-OpenSSL/2107 b/test/scripts/2100-OpenSSL/2107
deleted file mode 100644
index 9317a5e..0000000
--- a/test/scripts/2100-OpenSSL/2107
+++ /dev/null
@@ -1,10 +0,0 @@
-# TLS client: log_smtp_confirmation
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx@???
-Test message
-****
-exim -qf
-****
-killdaemon
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2108 b/test/scripts/2100-OpenSSL/2108
deleted file mode 100644
index 43ca6cf..0000000
--- a/test/scripts/2100-OpenSSL/2108
+++ /dev/null
@@ -1,14 +0,0 @@
-# TLS client: general
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim CALLER@???
-Test message. Contains FF: ?
-****
-exim CALLER@??? abcd@??? xyz@???
-Test message to two different hosts
-****
-exim -v -qf
-****
-killdaemon
-exim -DSERVER=server -DNOTDAEMON -qf
-****
diff --git a/test/scripts/2100-OpenSSL/2109 b/test/scripts/2100-OpenSSL/2109
deleted file mode 100644
index 85cb130..0000000
--- a/test/scripts/2100-OpenSSL/2109
+++ /dev/null
@@ -1,10 +0,0 @@
-# TLS client: hosts_avoid_tls
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx@???
-Test message
-****
-exim -qf
-****
-killdaemon
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2113 b/test/scripts/2100-OpenSSL/2113
deleted file mode 100644
index c1341e8..0000000
--- a/test/scripts/2100-OpenSSL/2113
+++ /dev/null
@@ -1,51 +0,0 @@
-# TLS client: multiple messages over one connection
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx@???
-Test message 1
-****
-exim usery@???
-Test message 2
-****
-exim userz@???
-Test message 3
-****
-exim -d-all+acl -qqf
-****
-killdaemon
-exim -DSERVER=server -DNOTDAEMON -qf
-****
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim usera@???
-Test message 1
-****
-exim userb@???
-Test message 2
-****
-exim userc@???
-Test message 3
-****
-exim -DEQUIRE -d-all+acl -qqf
-****
-killdaemon
-exim -DSERVER=server -DNOTDAEMON -qf
-****
-#
-#
-# no tls proxy (default for test was permitting proxy)
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx@???
-Test message 1
-****
-exim usery@???
-Test message 2
-****
-exim userz@???
-Test message 3
-****
-exim -d-all+acl '-DPEX=*' -qqf
-****
-killdaemon
diff --git a/test/scripts/2100-OpenSSL/2116 b/test/scripts/2100-OpenSSL/2116
deleted file mode 100644
index a11125b..0000000
--- a/test/scripts/2100-OpenSSL/2116
+++ /dev/null
@@ -1,15 +0,0 @@
-# TLS client: timeout while setting up TLS
-server PORT_S
-220 ESMTP
-EHLO
-250-OK
-250-STARTTLS
-250 HELP
-STARTTLS
-220 Go ahead
-*sleep 2
-****
-exim -odi userx@domain1
-Test message
-****
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2117 b/test/scripts/2100-OpenSSL/2117
deleted file mode 100644
index 2d7bfff..0000000
--- a/test/scripts/2100-OpenSSL/2117
+++ /dev/null
@@ -1,14 +0,0 @@
-# TLS client: hosts_nopass_tls
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx@???
-Test message 1
-****
-exim userx@???
-Test message 2
-****
-exim -qqf
-****
-killdaemon
-exim -DSERVER=server -DNOTDAEMON -qf
-****
diff --git a/test/scripts/2100-OpenSSL/2121 b/test/scripts/2100-OpenSSL/2121
deleted file mode 100644
index 49ee4c1..0000000
--- a/test/scripts/2100-OpenSSL/2121
+++ /dev/null
@@ -1,52 +0,0 @@
-# TLS client: 4xx response to STARTTLS
-server PORT_S
-220 ESMTP
-EHLO
-250-OK
-250-HELP
-250-STARTTLS
-250 PIPELINING
-STARTTLS
-450 temp problem
-QUIT
-250 OK
-****
-exim -DTRYCLEAR=tls_tempfail_tryclear=false -odi x@y
-****
-server PORT_S
-220 ESMTP
-EHLO
-250-OK
-250-HELP
-250-STARTTLS
-250 PIPELINING
-STARTTLS
-450 temp problem
-MAIL FROM:
-250 OK
-RCPT TO:
-250 OK
-DATA
-354 Go ahead
-.
-250 OK
-QUIT
-250 OK
-****
-exim -qf
-****
-server PORT_S
-220 ESMTP
-EHLO
-250-OK
-250-HELP
-250-STARTTLS
-250 PIPELINING
-STARTTLS
-450 temp problem
-QUIT
-250 OK
-****
-exim -DREQUIRE=hosts_require_tls=* -odi x@y
-****
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2138 b/test/scripts/2100-OpenSSL/2138
deleted file mode 100644
index 79eaa2f..0000000
--- a/test/scripts/2100-OpenSSL/2138
+++ /dev/null
@@ -1,17 +0,0 @@
-# TLS client: multiple messages over one connection (continue_more)
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx0@??? userx1@???
-Test message 1
-****
-exim usery0@??? usery1@???
-Test message 2
-****
-exim userz0@??? userz1@???
-Test message 3
-****
-exim -qqf
-****
-killdaemon
-exim -DSERVER=server -DNOTDAEMON -qf
-****
diff --git a/test/scripts/2100-OpenSSL/2191 b/test/scripts/2100-OpenSSL/2191
deleted file mode 100644
index 86963f7..0000000
--- a/test/scripts/2100-OpenSSL/2191
+++ /dev/null
@@ -1,8 +0,0 @@
-# TLS client, CHUNKING transmission
-exim -DSERVER=server -DSRV=tls -bd -oX PORT_S
-****
-exim -oMt this-user -f this-user -odf other-user@???
-Test message. Contains FF: ?
-****
-killdaemon
-no_msglog_check
diff --git a/test/stderr/2008 b/test/stderr/1150
similarity index 85%
rename from test/stderr/2008
rename to test/stderr/1150
index 9f716c3..395644c 100644
--- a/test/stderr/2008
+++ b/test/stderr/1150
@@ -29,7 +29,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP>> QUIT
SMTP(close)>>
LOG: MAIN
- => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+ => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00"
LOG: MAIN
Completed
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
@@ -63,9 +63,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP>> QUIT
SMTP(close)>>
LOG: MAIN
- => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+ => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
LOG: MAIN
- -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+ -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
@@ -94,7 +94,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
SMTP>> QUIT
SMTP(close)>>
LOG: MAIN
- => abcd@??? R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
+ => abcd@??? R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00"
LOG: MAIN
Completed
LOG: queue_run MAIN
diff --git a/test/stderr/2113 b/test/stderr/1157
similarity index 94%
rename from test/stderr/2113
rename to test/stderr/1157
index dd24fbc..368ccc0 100644
--- a/test/stderr/2113
+++ b/test/stderr/1157
@@ -36,7 +36,7 @@ cmd buf flush ddd bytes
SMTP<< 354 Enter message, ending with "." on a line by itself
SMTP<< 250 OK id=10HmbA-0005vi-00
LOG: MAIN
- => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+ => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -122,7 +122,7 @@ cmd buf flush ddd bytes
SMTP<< 354 Enter message, ending with "." on a line by itself
SMTP<< 250 OK id=10HmbG-0005vi-00
LOG: MAIN
- => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
+ => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00"
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -217,7 +217,7 @@ cmd buf flush ddd bytes
250 HELP
SMTP(close)>>
LOG: MAIN
- => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
+ => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00"
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -254,7 +254,7 @@ cmd buf flush ddd bytes
250 HELP
SMTP(close)>>
LOG: MAIN
- => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
+ => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00"
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -285,7 +285,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP(close)>>
LOG: MAIN
- => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00"
+ => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00"
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2013 b/test/stderr/2013
deleted file mode 100644
index f3c5421..0000000
--- a/test/stderr/2013
+++ /dev/null
@@ -1,296 +0,0 @@
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-admin user
-dropping to exim gid; retaining priv uid
-LOG: queue_run MAIN
- Start queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
- SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP>> STARTTLS
-cmd buf flush ddd bytes
- SMTP<< 220 TLS go ahead
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userx@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbA-0005vi-00
-LOG: MAIN
- => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userz@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbB-0005vi-00
- SMTP(close)>>
-LOG: MAIN
- => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<usery@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbC-0005vi-00
- SMTP>> QUIT
-cmd buf flush ddd bytes
- SMTP(close)>>
->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
-LOG: MAIN
- => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-LOG: queue_run MAIN
- End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-admin user
-dropping to exim gid; retaining priv uid
-LOG: queue_run MAIN
- Start queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
- SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP>> STARTTLS
-cmd buf flush ddd bytes
- SMTP<< 220 TLS go ahead
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<usera@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbG-0005vi-00
-LOG: MAIN
- => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userc@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbH-0005vi-00
- SMTP(close)>>
-LOG: MAIN
- => userc@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userb@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbI-0005vi-00
- SMTP>> QUIT
-cmd buf flush ddd bytes
- SMTP(close)>>
->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
-LOG: MAIN
- => userb@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-LOG: queue_run MAIN
- End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-admin user
-dropping to exim gid; retaining priv uid
-LOG: queue_run MAIN
- Start queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
- SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP>> STARTTLS
-cmd buf flush ddd bytes
- SMTP<< 220 TLS go ahead
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userx@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbM-0005vi-00
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP(close)>>
-LOG: MAIN
- => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
- SMTP>> STARTTLS
-cmd buf flush ddd bytes
- SMTP<< 220 TLS go ahead
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userz@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbN-0005vi-00
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP(close)>>
-LOG: MAIN
- => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
- SMTP>> STARTTLS
-cmd buf flush ddd bytes
- SMTP<< 220 TLS go ahead
- SMTP>> EHLO myhost.test.ex
-cmd buf flush ddd bytes
- SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<usery@???>
- SMTP>> DATA
-cmd buf flush ddd bytes
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP<< 250 OK id=10HmbO-0005vi-00
- SMTP>> QUIT
-cmd buf flush ddd bytes
- SMTP(close)>>
-LOG: MAIN
- => usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00"
-LOG: MAIN
- Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-LOG: queue_run MAIN
- End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
-
-******** SERVER ********
diff --git a/test/stderr/2108 b/test/stderr/2108
deleted file mode 100644
index 47f0578..0000000
--- a/test/stderr/2108
+++ /dev/null
@@ -1,115 +0,0 @@
-LOG: queue_run MAIN
- Start queue run: pid=pppp -qf
-delivering 10HmaX-0005vi-00 (queue run pid ppppp)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
- SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
- SMTP>> EHLO helo.data.changed
- SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP>> STARTTLS
- SMTP<< 220 TLS go ahead
-LOG: MAIN
- [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-LOG: MAIN
- [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
- SMTP>> EHLO helo.data.changed
- SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<CALLER@???>
- SMTP>> DATA
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP>> writing message and terminating "."
- SMTP<< 250 OK id=10HmaZ-0005vi-00
- SMTP>> QUIT
- SMTP(close)>>
-LOG: MAIN
- => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
-LOG: MAIN
- Completed
-delivering 10HmaY-0005vi-00 (queue run pid ppppp)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
- SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
- SMTP>> EHLO helo.data.changed
- SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP>> STARTTLS
- SMTP<< 220 TLS go ahead
-LOG: MAIN
- [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-LOG: MAIN
- [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
- SMTP>> EHLO helo.data.changed
- SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<CALLER@???>
- SMTP>> RCPT TO:<xyz@???>
- SMTP>> DATA
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP>> writing message and terminating "."
- SMTP<< 250 OK id=10HmbA-0005vi-00
- SMTP>> QUIT
- SMTP(close)>>
-LOG: MAIN
- => CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-LOG: MAIN
- -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
- SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
- SMTP>> EHLO myhost.test.ex
- SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250-STARTTLS
- 250 HELP
- SMTP>> STARTTLS
- SMTP<< 220 TLS go ahead
-LOG: MAIN
- [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-LOG: MAIN
- [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="ip4.ip4.ip4.ip4"
- SMTP>> EHLO myhost.test.ex
- SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
- 250-SIZE 52428800
- 250-8BITMIME
- 250-PIPELINING
- 250 HELP
- SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<abcd@???>
- SMTP>> DATA
- SMTP<< 250 OK
- SMTP<< 250 Accepted
- SMTP<< 354 Enter message, ending with "." on a line by itself
- SMTP>> writing message and terminating "."
- SMTP<< 250 OK id=10HmbB-0005vi-00
- SMTP>> QUIT
- SMTP(close)>>
-LOG: MAIN
- => abcd@??? R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
-LOG: MAIN
- Completed
-LOG: queue_run MAIN
- End queue run: pid=pppp -qf
-
-******** SERVER ********
diff --git a/test/stdout/2016 b/test/stdout/1158
similarity index 100%
rename from test/stdout/2016
rename to test/stdout/1158
diff --git a/test/stdout/2021 b/test/stdout/1161
similarity index 100%
rename from test/stdout/2021
rename to test/stdout/1161
diff --git a/test/stdout/2116 b/test/stdout/2116
deleted file mode 100644
index 4fc9cc4..0000000
--- a/test/stdout/2116
+++ /dev/null
@@ -1,13 +0,0 @@
-
-******** SERVER ********
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO the.local.host.name
-250-OK
-250-STARTTLS
-250 HELP
-STARTTLS
-220 Go ahead
-*sleep 2
-End of script
diff --git a/test/stdout/2121 b/test/stdout/2121
deleted file mode 100644
index fad9166..0000000
--- a/test/stdout/2121
+++ /dev/null
@@ -1,57 +0,0 @@
-
-******** SERVER ********
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO myhost.test.ex
-250-OK
-250-HELP
-250-STARTTLS
-250 PIPELINING
-STARTTLS
-450 temp problem
-QUIT
-250 OK
-End of script
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO myhost.test.ex
-250-OK
-250-HELP
-250-STARTTLS
-250 PIPELINING
-STARTTLS
-450 temp problem
-MAIL FROM:<CALLER@???>
-250 OK
-RCPT TO:<x@y>
-250 OK
-DATA
-354 Go ahead
-Received: from CALLER by myhost.test.ex with local (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
-From: CALLER_NAME <CALLER@???>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-.
-250 OK
-QUIT
-250 OK
-End of script
-Listening on port 1224 ...
-Connection request from [127.0.0.1]
-220 ESMTP
-EHLO myhost.test.ex
-250-OK
-250-HELP
-250-STARTTLS
-250 PIPELINING
-STARTTLS
-450 temp problem
-QUIT
-250 OK
-End of script
