From e23341ecd1efcf6339ae9458c4612357775dc286 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 30 Apr 2021 00:37:53 +0200 Subject: [PATCH] testsuite: reproduce BDAT with missing eol (Bug 1974) (cherry picked from commit e9cecc465a570c1a4f34b199eae6bdd0a52ee2b0) --- test/log/0900 | 1 + test/scripts/0000-Basic/0900 | 36 ++++++++++++++++++++++++---- test/stdout/0900 | 46 ++++++++++++++++++++++++++++++++---- 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/test/log/0900 b/test/log/0900 index a6e106367..85ba6d730 100644 --- a/test/log/0900 +++ b/test/log/0900 @@ -10,3 +10,4 @@ 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex 2017-07-30 18:51:05.712 H=(tester) [127.0.0.1] F= rejected RCPT : relay not permitted 2017-07-30 18:51:05.712 rejected from H=(tester) [127.0.0.1]: Non-CRLF-terminated header, under CHUNKING: message abandoned +2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex diff --git a/test/scripts/0000-Basic/0900 b/test/scripts/0000-Basic/0900 index 4503ae0c0..1c0e43552 100644 --- a/test/scripts/0000-Basic/0900 +++ b/test/scripts/0000-Basic/0900 @@ -38,7 +38,7 @@ ehlo tester ??? 250- ??? 250- ??? 250- -??? 250 +??? 250 mail from:someone@some.domain ??? 250 rcpt to:CALLER@test.ex @@ -82,7 +82,7 @@ ehlo tester ??? 250- ??? 250- ??? 250- -??? 250 +??? 250 mail from:someone@some.domain ??? 250 rcpt to:CALLER@test.ex @@ -105,7 +105,7 @@ ehlo tester ??? 250- ??? 250- ??? 250- -??? 250 +??? 250 mail from:someone@some.domain ??? 250 rcpt to:CALLER@test.ex @@ -131,7 +131,7 @@ ehlo tester ??? 250- ??? 250- ??? 250- -??? 250 +??? 250 mail from:someone@some.domain ??? 250 rcpt to:CALLER@test.ex @@ -152,7 +152,7 @@ EHLO tester ??? 250- ??? 250- ??? 250- -??? 250 +??? 250 mail from:someone@some.domain ??? 250 rcpt to:CALLER@test.ex @@ -240,6 +240,32 @@ quit ??? 221 **** # +# plain, small message (body w/o lineend) +client 127.0.0.1 PORT_D +??? 220 +ehlo tester +??? 250- +??? 250-SIZE +??? 250-8BITMIME +??? 250-PIPELINING +??? 250-CHUNKING +??? 250 HELP +mail from:someone@some.domain +??? 250 +rcpt to:CALLER@test.ex +??? 250 +bdat 98 last +To: Susan@random.com +From: Sam@random.com +Subject: This is a bodyfull test message + +>>> 1234567890 +??? 250- +??? 250 +quit +??? 221 +**** +# # killdaemon no_msglog_check diff --git a/test/stdout/0900 b/test/stdout/0900 index 72269fad9..ccd10f0a1 100644 --- a/test/stdout/0900 +++ b/test/stdout/0900 @@ -47,7 +47,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-CHUNKING -??? 250 +??? 250 <<< 250 HELP >>> mail from:someone@some.domain ??? 250 @@ -107,7 +107,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-CHUNKING -??? 250 +??? 250 <<< 250 HELP >>> mail from:someone@some.domain ??? 250 @@ -137,7 +137,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-CHUNKING -??? 250 +??? 250 <<< 250 HELP >>> mail from:someone@some.domain ??? 250 @@ -173,7 +173,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-CHUNKING -??? 250 +??? 250 <<< 250 HELP >>> mail from:someone@some.domain ??? 250 @@ -205,7 +205,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-CHUNKING -??? 250 +??? 250 <<< 250 HELP >>> mail from:someone@some.domain ??? 250 @@ -329,3 +329,39 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 221 <<< 221 testhost.test.ex closing connection End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> ehlo tester +??? 250- +<<< 250-testhost.test.ex Hello tester [127.0.0.1] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250-8BITMIME +<<< 250-8BITMIME +??? 250-PIPELINING +<<< 250-PIPELINING +??? 250-CHUNKING +<<< 250-CHUNKING +??? 250 HELP +<<< 250 HELP +>>> mail from:someone@some.domain +??? 250 +<<< 250 OK +>>> rcpt to:CALLER@test.ex +??? 250 +<<< 250 Accepted +>>> bdat 98 last +>>> To: Susan@random.com +>>> From: Sam@random.com +>>> Subject: This is a bodyfull test message +>>> +>>> 1234567890 +??? 250- +<<< 250- 98 byte chunk, total 100 +??? 250 +<<< 250 OK id=10HmbC-0005vi-00 +>>> quit +??? 221 +<<< 221 testhost.test.ex closing connection +End of script -- 2.30.2