summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/log/09016
-rw-r--r--test/scripts/0000-Basic/090148
-rw-r--r--test/stderr/00214
-rw-r--r--test/stderr/002212
-rw-r--r--test/stderr/03036
-rw-r--r--test/stderr/03715
-rw-r--r--test/stderr/038611
-rw-r--r--test/stderr/04656
-rw-r--r--test/stderr/04871
-rw-r--r--test/stderr/05754
-rw-r--r--test/stderr/54109
-rw-r--r--test/stderr/54209
-rw-r--r--test/stdout/090164
13 files changed, 180 insertions, 5 deletions
diff --git a/test/log/0901 b/test/log/0901
index 01135920b..cd8c52e75 100644
--- a/test/log/0901
+++ b/test/log/0901
@@ -4,10 +4,12 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone1@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone2@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone3@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 SMTP data timeout (message abandoned) on connection from (tester) [127.0.0.1] F=<someone4@some.domain>
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= someone2A@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= someone3A@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 SMTP data timeout (message abandoned) on connection from (tester) [127.0.0.1] F=<someone4@some.domain>
1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data
1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= someone8@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= someone8@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "bdat 1" H=(tester) [127.0.0.1] next input="bdat 87 last\r\n"
1999-03-02 09:44:33 SMTP call from (tester) [127.0.0.1] dropped: too many syntax or protocol errors (last command was "From: Sam@random.com")
1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data (header)
diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901
index a52359966..9908d5ecd 100644
--- a/test/scripts/0000-Basic/0901
+++ b/test/scripts/0000-Basic/0901
@@ -58,8 +58,54 @@ mail from:someone3@some.domain
rcpt to:CALLER@test.ex
??? 250
bdat 10
-To: Susan@bdat 78 last
+>>> To: Susan@
??? 250
+bdat 78 last
+random.com
+From: Sam@random.com
+Subject: This is a bodyless test message
+
+??? 250-
+??? 250
+quit
+??? 221
+****
+#
+# plain, small message (with body)
+# nonlast 1st bdat, noop, last-bdat(0) INCORRECTLY PIPELINED
+# immediate followon 2nd message
+client 127.0.0.1 PORT_D
+??? 220
+ehlo tester
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:someone2A@some.domain
+??? 250
+rcpt to:CALLER@test.ex
+??? 250
+bdat 100
+To: Susan@random.com
+From: Sam@random.com
+Subject: This is a bodyfull test message
+
+1234567890
+??? 250
+noop
+??? 250
+bdat 0 last
+??? 250-
+??? 250
+mail from:someone3A@some.domain
+??? 250
+rcpt to:CALLER@test.ex
+??? 250
+bdat 10
+>>> To: Susan@
+??? 250
+bdat 78 last
random.com
From: Sam@random.com
Subject: This is a bodyless test message
diff --git a/test/stderr/0021 b/test/stderr/0021
index 7c5a79ee9..4be6c99c5 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -178,9 +178,13 @@ LOG: PANIC
rcpt accepted
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Some{SP}message{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers added by MAIL or RCPT ACL:
X-ACL-Warn: added header line
>>
+PDKIM >> raw hdr: quit{CR}{LF}
LOG: MAIN
<= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
Exim version x.yz ....
diff --git a/test/stderr/0022 b/test/stderr/0022
index bcafb8589..e3269500f 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -41,6 +41,9 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Testing{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
search_tidyup called
@@ -54,6 +57,7 @@ P Received: from [V4NET.9.8.7]
(envelope-from <x@y>)
id 10HmbF-0005vi-00
for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
@@ -112,6 +116,9 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Testing{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
search_tidyup called
@@ -125,6 +132,7 @@ P Received: from [V4NET.9.8.7]
(envelope-from <x@y>)
id 10HmbG-0005vi-00
for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
@@ -181,6 +189,9 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Testing{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
search_tidyup called
@@ -197,6 +208,7 @@ P Received: from [V4NET.9.8.7]
>>Headers added by MAIL or RCPT ACL:
X-ACL-Warn: warn user message
>>
+PDKIM >> raw hdr: quit{CR}{LF}
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
diff --git a/test/stderr/0303 b/test/stderr/0303
index 0a78b30f0..8a77fd613 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -89,6 +89,8 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
search_tidyup called
@@ -101,6 +103,7 @@ P Received: from [V4NET.2.3.4]
by myhost.test.ex with esmtp (Exim x.yz)
id 10HmaX-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
@@ -165,6 +168,8 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
search_tidyup called
@@ -177,6 +182,7 @@ P Received: from host.name.tld ([V4NET.2.3.4])
by myhost.test.ex with esmtp (Exim x.yz)
id 10HmaY-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
diff --git a/test/stderr/0371 b/test/stderr/0371
index c59988723..25c6cdbee 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -74,6 +74,10 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
+PDKIM >> raw hdr: vrfy{SP}x@y{CR}{LF}
+PDKIM >> raw hdr: mail{SP}from:<x@y>{CR}{LF}
>>Headers received:
search_tidyup called
@@ -87,6 +91,7 @@ P Received: from [V4NET.0.0.0] (helo=something)
(envelope-from <x@y>)
id 10HmaX-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
using ACL "data"
processing "accept"
check set acl_m0 = $acl_m0; data
diff --git a/test/stderr/0386 b/test/stderr/0386
index 44e856da2..be777a736 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -191,6 +191,13 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Message{SP}1{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
+PDKIM >> raw hdr: rset{CR}{LF}
+PDKIM >> raw hdr: mail{SP}from:<x@y>{CR}{LF}
+PDKIM >> raw hdr: rcpt{SP}to:<2@b>{CR}{LF}
+PDKIM >> raw hdr: data{CR}{LF}
>>Headers received:
search_tidyup called
@@ -372,6 +379,9 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Message{SP}2{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
search_tidyup called
@@ -389,6 +399,7 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
X-Warning: This is a test blacklisting message
>>
+PDKIM >> raw hdr: quit{CR}{LF}
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
diff --git a/test/stderr/0465 b/test/stderr/0465
index 92250956d..594bd002c 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -62,6 +62,8 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: To:{SP}abc@domain.{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
To: abc@domain.
@@ -79,6 +81,7 @@ Data file written for message 10HmaY-0005vi-00
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaY-0005vi-00
for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
using ACL "check_data"
processing "accept"
check verify = header_syntax
@@ -135,6 +138,8 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: To:{SP}abc@xyz.{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
To: abc@xyz.
@@ -152,6 +157,7 @@ Data file written for message 10HmaX-0005vi-00
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00
for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
using ACL "check_data"
processing "accept"
check verify = header_syntax
diff --git a/test/stderr/0487 b/test/stderr/0487
index 7319b67dd..c16127b83 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -41,6 +41,7 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: From:{SP}unqualified{CR}{LF}
>>Headers received:
From: unqualified
diff --git a/test/stderr/0575 b/test/stderr/0575
index 210f868ad..37176f114 100644
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -35,6 +35,9 @@ DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Message.{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers received:
search_tidyup called
@@ -48,6 +51,7 @@ P Received: from [V4NET.0.0.0]
(envelope-from <x@y>)
id 10HmaX-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+PDKIM >> raw hdr: quit{CR}{LF}
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
diff --git a/test/stderr/5410 b/test/stderr/5410
index acfc011cc..04c805275 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -131,6 +131,8 @@ accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -227,6 +229,7 @@ considering:
for userx@domain.com
----------- start cutthrough headers send -----------
----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -345,6 +348,8 @@ accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -441,6 +446,7 @@ considering:
for usery@domain.com
----------- start cutthrough headers send -----------
----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -559,6 +565,8 @@ accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -655,6 +663,7 @@ considering:
for usery@domain.com
----------- start cutthrough headers send -----------
----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stderr/5420 b/test/stderr/5420
index ff032e986..a4f64f2d1 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -130,6 +130,8 @@ accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -226,6 +228,7 @@ considering:
for userx@domain.com
----------- start cutthrough headers send -----------
----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -344,6 +347,8 @@ accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -440,6 +445,7 @@ considering:
for usery@domain.com
----------- start cutthrough headers send -----------
----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -558,6 +564,8 @@ accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> DATA
SMTP<< 354 Enter message, ending with "." on a line by itself
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -654,6 +662,7 @@ considering:
for usery@domain.com
----------- start cutthrough headers send -----------
----------- done cutthrough headers send ------------
+PDKIM >> raw hdr: QUIT{CR}{LF}
considering: ${tod_full}
expanding: ${tod_full}
result: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0901 b/test/stdout/0901
index 0e35d76c3..99eb81231 100644
--- a/test/stdout/0901
+++ b/test/stdout/0901
@@ -74,9 +74,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250
<<< 250 Accepted
>>> bdat 10
->>> To: Susan@bdat 78 last
+>>> To: Susan@
??? 250
<<< 250 10 byte chunk received
+>>> bdat 78 last
>>> random.com
>>> From: Sam@random.com
>>> Subject: This is a bodyless test message
@@ -103,6 +104,65 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-CHUNKING
??? 250
<<< 250 HELP
+>>> mail from:someone2A@some.domain
+??? 250
+<<< 250 OK
+>>> rcpt to:CALLER@test.ex
+??? 250
+<<< 250 Accepted
+>>> bdat 100
+>>> To: Susan@random.com
+>>> From: Sam@random.com
+>>> Subject: This is a bodyfull test message
+>>>
+>>> 1234567890
+??? 250
+<<< 250 100 byte chunk received
+>>> noop
+??? 250
+<<< 250 OK
+>>> bdat 0 last
+??? 250-
+<<< 250- 0 byte chunk, total 100
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> mail from:someone3A@some.domain
+??? 250
+<<< 250 OK
+>>> rcpt to:CALLER@test.ex
+??? 250
+<<< 250 Accepted
+>>> bdat 10
+>>> To: Susan@
+??? 250
+<<< 250 10 byte chunk received
+>>> bdat 78 last
+>>> random.com
+>>> From: Sam@random.com
+>>> Subject: This is a bodyless test message
+>>>
+??? 250-
+<<< 250- 78 byte chunk, total 88
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
+>>> quit
+??? 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-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-CHUNKING
+??? 250
+<<< 250 HELP
>>> mail from:someone4@some.domain
??? 250
<<< 250 OK
@@ -245,7 +305,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250- 88 byte chunk, total 88
??? 250
-<<< 250 OK id=10HmbB-0005vi-00
+<<< 250 OK id=10HmbD-0005vi-00
>>> quit
??? 221
<<< 221 testhost.test.ex closing connection
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-22 15:13:50 +0000