[exim-cvs] Testsuite: munge and shuffle for non-TLS build

Autor: Exim Git Commits Mailing List
Data:
Para: exim-cvs
Asunto: [exim-cvs] Testsuite: munge and shuffle for non-TLS build

Gitweb: https://git.exim.org/exim.git/commitdiff/f318f517d8099632aa06fa7f65af6f40e7e3f7fb

Commit:     f318f517d8099632aa06fa7f65af6f40e7e3f7fb
Parent:     4ae338f1b9014e93e96fc87d94ba8a4a97730124
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Jul 10 12:00:24 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Jul 10 13:28:49 2024 +0100

    Testsuite: munge and shuffle for non-TLS build
---
 test/confs/0900                                    |   8 -
 test/confs/{0900 => 1166}                          |  98 ++------
 test/log/0905                                      |  31 +--
 test/log/1166                                      |   9 +
 test/rejectlog/{0905 => 1166}                      |   0
 test/runtest                                       |   4 +
 test/scripts/0000-Basic/0905                       |  34 ---
 .../{0000-Basic/0905 => 1100-Basic-TLS/1166}       | 246 +--------------------
 test/stderr/0143                                   |   1 -
 test/stderr/0398                                   |   1 -
 test/stderr/0432                                   |   1 -
 test/stderr/0450                                   |   2 -
 test/stderr/0476                                   |   2 -
 test/stderr/0512                                   |   6 -
 test/stderr/0623                                   |   3 -
 test/stderr/0909                                   |   5 -
 test/stderr/2035                                   |   1 -
 test/stderr/2135                                   |   1 -
 test/stderr/4052                                   |   1 -
 test/stderr/5410                                   |   3 -
 test/stderr/5420                                   |   3 -
 21 files changed, 49 insertions(+), 411 deletions(-)

diff --git a/test/confs/0900 b/test/confs/0900
index 80c0211a9..219751ec1 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -57,10 +57,6 @@ ALLOW
begin acl

 check_recipient:
-.ifdef RETRY2
-  drop     condition = ${if eq {SERVER}{server}}
-     message = 550 we really do not like you
-.endif
   accept hosts = :
   accept domains = +local_domains
   deny   message = relay not permitted
@@ -112,11 +108,7 @@ local_delivery:

 remote_smtp:
   driver = smtp
-.ifdef RETRY2
-  hosts =    127.0.0.1 : HOSTIPV4
-.else
   hosts =    127.0.0.1
-.endif
   port =    PORT_S
   hosts_try_fastopen = :
 .ifdef _HAVE_TLS
diff --git a/test/confs/0900 b/test/confs/1166
similarity index 50%
copy from test/confs/0900
copy to test/confs/1166
index 80c0211a9..1f4397690 100644
--- a/test/confs/0900
+++ b/test/confs/1166
@@ -1,8 +1,5 @@
-# Exim test configuration 0900
+# Exim test configuration 1166
 SERVER=
-SRV=
-LIST=
-ALLOW=

exim_path = EXIM_PATH
keep_environment =
@@ -13,9 +10,7 @@ log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
-.ifdef _HAVE_TLS
-tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
-.endif
+tls_advertise_hosts = *
.ifdef _HAVE_PIPE_CONNECT
pipelining_connect_advertise_hosts = :
.endif
@@ -32,43 +27,26 @@ primary_hostname = testhost.test.ex
domainlist local_domains = @ : test.ex

acl_smtp_rcpt = check_recipient
-.ifdef _HAVE_PRDR
-acl_smtp_data_prdr = check_prdr
-.endif
acl_smtp_data = check_data
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s

-.ifdef _HAVE_DKIM
-log_selector = +received_recipients +connection_id +millisec +dkim_verbose
-.else
log_selector = +received_recipients +connection_id +millisec
-.endif

-.ifdef _HAVE_TLS
tls_certificate = DIR/aux-fixed/cert1
-.endif
-
-ALLOW

# ----- ACL -----

begin acl

 check_recipient:
-.ifdef RETRY2
   drop     condition = ${if eq {SERVER}{server}}
      message = 550 we really do not like you
-.endif
   accept hosts = :
   accept domains = +local_domains
   deny   message = relay not permitted

-check_prdr:
-  accept local_parts = good
-  deny
-
 check_data:
   warn   message = X-acl-message-linecount: $message_linecount
   accept
@@ -80,77 +58,47 @@ begin routers
 to_server:
   driver = accept
   condition =    ${if !eq {SERVER}{server}}
-  transport =    remote_smtp${if eq {SRV}{dkim} {_dkim}}
+  transport =    remote_smtp
   errors_to =    ""

-fail_remote_domains:
- driver = redirect
- domains = ! +local_domains
- data = :fail: unrouteable mail domain "$domain"
-
-localuser:
- driver = accept
- check_local_user
- transport = local_delivery
- headers_add = X-local-user: uid=$local_user_uid gid=$local_user_gid
+#fail_remote_domains:
+# driver = redirect
+# domains = ! +local_domains
+# data = :fail: unrouteable mail domain "$domain"
+#
+#localuser:
+# driver = accept
+# check_local_user
+# transport = local_delivery
+# headers_add = X-local-user: uid=$local_user_uid gid=$local_user_gid

# ----- Transports -----

begin transports

-local_delivery:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  file = DIR/test-mail/$local_part
-  create_file = DIR/test-mail
-  headers_add = "X-body-linecount: $body_linecount\n\
-                 X-message-linecount: $message_linecount\n\
-                 X-received-count: $received_count"
-  return_path_add
+#local_delivery:
+#  driver = appendfile
+#  delivery_date_add
+#  envelope_to_add
+#  file = DIR/test-mail/$local_part
+#  create_file = DIR/test-mail
+#  headers_add = "X-body-linecount: $body_linecount\n\
+#                 X-message-linecount: $message_linecount\n\
+#                 X-received-count: $received_count"
+#  return_path_add

 remote_smtp:
   driver = smtp
-.ifdef RETRY2
   hosts =    127.0.0.1 : HOSTIPV4
-.else
-  hosts =    127.0.0.1
-.endif
   port =    PORT_S
   hosts_try_fastopen = :
-.ifdef _HAVE_TLS
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames =
-.endif
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s

-remote_smtp_dkim:
-  driver = smtp
-  hosts =    127.0.0.1
-  port =    PORT_S
-  hosts_try_fastopen = :
-.ifdef _HAVE_TLS
-  tls_verify_certificates = DIR/aux-fixed/cert1
-  tls_verify_cert_hostnames =
-.endif
-  allow_localhost
-  command_timeout = 2s
-  final_timeout = 2s
-
-.ifdef _HAVE_DKIM
-.ifdef SRV
-  dkim_domain =        test.ex
-  dkim_selector =    sel
-  dkim_private_key =    DIR/aux-fixed/dkim/dkim.private
-.ifndef HEADERS_MAXSIZE
-  dkim_sign_headers =    LIST
-.endif
-.endif
-.endif
-
 # ----- Retry -----

 begin retry
diff --git a/test/log/0905 b/test/log/0905
index d53fe9dbf..1bda25abc 100644
--- a/test/log/0905
+++ b/test/log/0905
@@ -1,33 +1,24 @@
-2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 <= sender@??? U=root Ci=p1235 P=local-bsmtp S=sss for a@???
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 <= sender@??? U=root Ci=p1234 P=local-bsmtp S=sss for a@???
 2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 => a@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat"
 2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 Completed
-2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 <= sender@??? U=root Ci=p1236 P=local-bsmtp S=sss for c@???
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 <= sender@??? U=root Ci=p1235 P=local-bsmtp S=sss for c@???
 2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 => c@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat"
 2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 Completed
-2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 <= sender@??? U=root Ci=p1237 P=local-bsmtp S=sss for d@???
+2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 <= sender@??? U=root Ci=p1236 P=local-bsmtp S=sss for d@???
 2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 ** d@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 unacceptable mail-from
 2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 d@???: error ignored
 2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 Completed
-2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 <= sender@??? U=root Ci=p1238 P=local-bsmtp S=sss for c1@???
+2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 <= sender@??? U=root Ci=p1237 P=local-bsmtp S=sss for c1@???
 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from
 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 == c1@??? R=to_server T=remote_smtp defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from
-2017-07-30 18:51:05.712 10HmbB-000000005vi-0000 <= sender@??? U=root Ci=p1239 P=local-bsmtp S=sss for e@???
+2017-07-30 18:51:05.712 10HmbB-000000005vi-0000 <= sender@??? U=root Ci=p1238 P=local-bsmtp S=sss for e@???
 2017-07-30 18:51:05.712 10HmbB-000000005vi-0000 ** e@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e@???>: 550 no such recipient
 2017-07-30 18:51:05.712 10HmbB-000000005vi-0000 e@???: error ignored
 2017-07-30 18:51:05.712 10HmbB-000000005vi-0000 Completed
-2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 <= sender@??? U=root Ci=p1240 P=local-bsmtp S=sss for f1@???
-2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 peer close after all rcpt responses; converting i/o-error to no-error
-2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 ** f1@??? 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: SMTP error from remote mail server after RCPT TO:<f1@???>: 550 we really do not like you
-2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 f1@???: error ignored
+2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 <= sender@??? U=root Ci=p1239 P=local-bsmtp S=sss for g@???
+2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 ** g@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 500 oops bdat
+2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 g@???: error ignored
 2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 Completed
-2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 <= sender@??? U=root Ci=p1241 P=local-bsmtp S=sss for g@???
-2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 ** g@??? R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 500 oops bdat
-2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 g@???: error ignored
-2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 Completed
-2017-07-30 18:51:05.712 10HmbE-000000005vi-0000 <= sender@??? U=root Ci=p1242 P=local-bsmtp S=sss for h@???
-2017-07-30 18:51:05.712 10HmbE-000000005vi-0000 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat
-2017-07-30 18:51:05.712 10HmbE-000000005vi-0000 == h@??? R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat
-
-******** SERVER ********
-2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1243, no queue runs, listening for SMTP on port PORT_S
-2017-07-30 18:51:05.712 H=localhost (testhost.test.ex) [127.0.0.1] Ci=p1234 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> rejected RCPT <f1@???>: 550 we really do not like you
+2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 <= sender@??? U=root Ci=p1240 P=local-bsmtp S=sss for h@???
+2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat
+2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 == h@??? R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat
diff --git a/test/log/1166 b/test/log/1166
new file mode 100644
index 000000000..db58a4312
--- /dev/null
+++ b/test/log/1166
@@ -0,0 +1,9 @@
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 <= sender@??? U=root Ci=p1235 P=local-bsmtp S=sss for f1@???
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 peer close after all rcpt responses; converting i/o-error to no-error
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 ** f1@??? 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: SMTP error from remote mail server after RCPT TO:<f1@???>: 550 we really do not like you
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 f1@???: error ignored
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 Completed
+
+******** SERVER ********
+2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_S
+2017-07-30 18:51:05.712 H=localhost (testhost.test.ex) [127.0.0.1] Ci=p1234 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> rejected RCPT <f1@???>: 550 we really do not like you
diff --git a/test/rejectlog/0905 b/test/rejectlog/1166
similarity index 100%
rename from test/rejectlog/0905
rename to test/rejectlog/1166
diff --git a/test/runtest b/test/runtest
index 8c58059d5..22e2b8f8d 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1367,6 +1367,10 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /in\s(?:tls_advertise_hosts\?|hosts_require_tls\?)
                 \sno\s\((option\sunset|end\sof\slist)\)/x;

+    # non-TLS builds cannot have DANE
+
+    next if /lack of DNSSEC traceability precludes DANE$/;
+
     # Skip auxiliary group lists because they will vary.

     next if /auxiliary group list:/;
diff --git a/test/scripts/0000-Basic/0905 b/test/scripts/0000-Basic/0905
index 390b19c2e..baeecc2ad 100644
--- a/test/scripts/0000-Basic/0905
+++ b/test/scripts/0000-Basic/0905
@@ -182,40 +182,6 @@ data
 QUIT
 ****
 #
-# server rejects RCPT cmd, and immediately drops the TCP conn
-sudo rm DIR/spool/db/retry
-exim -bd -DSERVER=server -DRETRY2 -DSRV=tls -oX PORT_S
-****
-sudo exim -DRETRY2 -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
-RCPT TO:<f1@???>
-DATA
-Subject: foo
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-BigHeader_500: 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345
-
-data
-.
-QUIT
-****
-killdaemon
 #
 # server rejects BDAT cmd
 server PORT_S
diff --git a/test/scripts/0000-Basic/0905 b/test/scripts/1100-Basic-TLS/1166
similarity index 72%
copy from test/scripts/0000-Basic/0905
copy to test/scripts/1100-Basic-TLS/1166
index 390b19c2e..033e8d634 100644
--- a/test/scripts/0000-Basic/0905
+++ b/test/scripts/1100-Basic-TLS/1166
@@ -1,194 +1,11 @@
-# CHUNKING transmission, short messages, PIPELINING
+# TLS client, CHUNKING, server rejects RCPT and drops TCP
 #
-# Pipelined cases
 #
-# Basic short message
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 345 LAST
-*data 345
-250 OK mail
-250 OK rcpt
-250 OK bdat
-QUIT
-225 OK
-*eof
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
-RCPT TO:<a@???>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# Error case: server wrongly expected more data, client gets timeout for data-ack
-# XXX This is a problem with data/quit pipelining.  The succeeding SMTP command cannot
-# be distinguished from the data, by the errroneous server.
-# Of course, we could avoid such pipelining on the client side, when BDAT is used.
-# But - is this any worse than a server failing to spot the data-dot under DATA?
-# I think not; both are culpable, and there is only so much the client can do.
-#server PORT_S
-#220 Greetings
-#EHLO
-#250-Hello there
-#250-PIPELINING
-#250 CHUNKING
-#MAIL FROM
-#RCPT TO
-#BDAT 345 LAST
-#*data 346
-#250 good mail cmd
-#****
-#sudo exim -odf -bS
-#EHLO test
-#MAIL FROM:<sender@???>
-#RCPT TO:<b@???>
-#DATA
-#Subject: foo
-#
-#data
-#.
-#QUIT
-#****
-#
-# Error case: server wrongly expected less data
-# client get the data-ack, sends quit - but server
-# sees a munged quit due to the outstanding data tail
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 345 LAST
-*data 344
-250 OK mail
-250 OK rcpt
-250 OK bdat
-QUIT
-225 OK
+exim -bd -DSERVER=server -oX PORT_S
 ****
 sudo exim -odf -bS
 EHLO test
 MAIL FROM:<sender@???>
-RCPT TO:<c@???>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server rejects MAIL cmd
-# transport coding does not handle the possible RSET-and-another transaction,
-# but always QUITs
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 345 LAST
-*data 345
-550 unacceptable mail-from
-550 rcpt ungood lacking mail-from
-500 bdat ungood lacking mail-from
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
-RCPT TO:<d@???>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server tmp-rejects MAIL cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 346 LAST
-*data 346
-450 greylisted mail-from
-550 rcpt ungood lacking mail-from
-500 bdat ungood lacking mail-from
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
-RCPT TO:<c1@???>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server rejects RCPT cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 345 LAST
-*data 345
-250 OK mail
-550 no such recipient
-500 oops bdat
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
-RCPT TO:<e@???>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server rejects RCPT cmd, and immediately drops the TCP conn
-sudo rm DIR/spool/db/retry
-exim -bd -DSERVER=server -DRETRY2 -DSRV=tls -oX PORT_S
-****
-sudo exim -DRETRY2 -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
 RCPT TO:<f1@???>
 DATA
 Subject: foo
@@ -217,63 +34,4 @@ QUIT
 ****
 killdaemon
 #
-# server rejects BDAT cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 345 LAST
-*data 345
-250 OK mail
-250 OK rcpt
-500 oops bdat
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
-RCPT TO:<g@???>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server tmp-rejects BDAT cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 345 LAST
-*data 345
-250 OK mail
-250 OK rcpt
-400 not right now bdat
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@???>
-RCPT TO:<h@???>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-#
 no_msglog_check
diff --git a/test/stderr/0143 b/test/stderr/0143
index 865c0c546..0a73ce275 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -24,7 +24,6 @@ hostlist:
 checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ...
 connected
   SMTP<< 220 ESMTP
diff --git a/test/stderr/0398 b/test/stderr/0398
index 081215ec7..bb31becd4 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -151,7 +151,6 @@ Attempting full verification using callout
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database
 interface=NULL port=PORT_S
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  127.0.0.1 in hosts_try_fastopen?
   list element: 
diff --git a/test/stderr/0432 b/test/stderr/0432
index a8a571ca4..1f17d175d 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -104,7 +104,6 @@ Attempting full verification using callout
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database
 interface=NULL port=PORT_S
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  127.0.0.1 in hosts_try_fastopen?
   list element: 
diff --git a/test/stderr/0450 b/test/stderr/0450
index 086e7474c..095135bbf 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -20,7 +20,6 @@ getting address for 127.0.0.1
 checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
  failed: Connection refused
 LOG: MAIN
@@ -53,7 +52,6 @@ no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1112 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ...
  failed: Connection refused
 LOG: MAIN
diff --git a/test/stderr/0476 b/test/stderr/0476
index e4667407c..ee229ff93 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -19,7 +19,6 @@ checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 connected
   SMTP<< 220 Server ready
@@ -91,7 +90,6 @@ checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (CALLER@???)
 set_process_info: pppp delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  failed: Connection refused
 LOG: MAIN
diff --git a/test/stderr/0512 b/test/stderr/0512
index 3994b704a..f3979815b 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -18,7 +18,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 hosts_max_try limit reached with this host
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  failed: Connection refused
 LOG: MAIN
@@ -32,7 +31,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 hosts_max_try limit reached with this host
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  failed: Connection refused
 LOG: MAIN
@@ -46,7 +44,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 hosts_max_try limit reached with this host
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  failed: Connection refused
 LOG: MAIN
@@ -60,7 +57,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 hosts_max_try limit reached with this host
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  failed: Connection refused
 LOG: MAIN
@@ -123,7 +119,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 hosts_max_try limit reached with this host
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  failed: Connection refused
 LOG: MAIN
@@ -137,7 +132,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 hosts_max_try limit reached with this host
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  failed: Connection refused
 LOG: MAIN
diff --git a/test/stderr/0623 b/test/stderr/0623
index 9131732eb..3786f7168 100644
--- a/test/stderr/0623
+++ b/test/stderr/0623
@@ -19,7 +19,6 @@ getting address for 127.0.0.1
 checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
@@ -90,7 +89,6 @@ no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
@@ -161,7 +159,6 @@ no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
diff --git a/test/stderr/0909 b/test/stderr/0909
index 5950dd510..3ba13b3b0 100644
--- a/test/stderr/0909
+++ b/test/stderr/0909
@@ -23,7 +23,6 @@ getting address for 127.0.0.1
 checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (good@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
@@ -94,7 +93,6 @@ getting address for 127.0.0.1
 checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaY-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (nopipe@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
@@ -164,7 +162,6 @@ getting address for 127.0.0.1
 checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
@@ -239,7 +236,6 @@ no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
@@ -314,7 +310,6 @@ no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (dataloss@???)
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 Server ready
diff --git a/test/stderr/2035 b/test/stderr/2035
index e99c7314a..920205672 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -4,7 +4,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stderr/2135 b/test/stderr/2135
index e99c7314a..920205672 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -4,7 +4,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stderr/4052 b/test/stderr/4052
index 3d4a4501f..f90265149 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -22,7 +22,6 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbP-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (extchange@???)
 Transport port=25 replaced by host-specific port=PORT_D
-lack of DNSSEC traceability precludes DANE
 EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000
 Using cached cleartext PIPECONNECT
   SMTP|> EHLO the.local.host.name
diff --git a/test/stderr/5410 b/test/stderr/5410
index 273d4eecd..9b4f0ff8a 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -124,7 +124,6 @@ domain.com in "*"?
 try option transport
 try option unseen
 try option interface
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
@@ -782,7 +781,6 @@ domain.com in "*"?
 try option transport
 try option unseen
 try option interface
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
@@ -1390,7 +1388,6 @@ domain.com in "*"?
 try option transport
 try option unseen
 try option interface
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
diff --git a/test/stderr/5420 b/test/stderr/5420
index 0049a548f..caa9e0de0 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -124,7 +124,6 @@ domain.com in "*"?
 try option transport
 try option unseen
 try option interface
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
@@ -782,7 +781,6 @@ domain.com in "*"?
 try option transport
 try option unseen
 try option interface
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
@@ -1390,7 +1388,6 @@ domain.com in "*"?
 try option transport
 try option unseen
 try option interface
-lack of DNSSEC traceability precludes DANE
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/

Esta mensaxe é parte do seguinte fío:
	Árbore completa do fío ordenada por data