diff options
| author | Jeremy Harris <jgh@wizmail.org> | 2017-10-01 15:36:32 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh@wizmail.org> | 2017-10-01 15:36:32 +0100 |
| commit | d5b80e59458182b2d557a929a18cb8c70cd56b68 (patch) | |
| tree | 1707bd0710e1a37ef5872533ab531dd22b138d6d /test/stdout | |
| parent | d5c0d8c9374623620844d539d4810da63e9abca1 (diff) | |
| parent | e924c08b7d031b712013a7a897e2d430b302fe6c (diff) | |
Merge branch 'master' into 4.next
Diffstat (limited to 'test/stdout')
| -rw-r--r-- | test/stdout/0002 | 3 | ||||
| -rw-r--r-- | test/stdout/0035 | 7 | ||||
| -rw-r--r-- | test/stdout/0211 | 10 | ||||
| -rw-r--r-- | test/stdout/0227 | 79 | ||||
| -rw-r--r-- | test/stdout/0245 | 1 | ||||
| -rw-r--r-- | test/stdout/0250 | 3 | ||||
| -rw-r--r-- | test/stdout/0254 | 3 | ||||
| -rw-r--r-- | test/stdout/0311 | 2 | ||||
| -rw-r--r-- | test/stdout/0338 | 1 | ||||
| -rw-r--r-- | test/stdout/0376 | 4 | ||||
| -rw-r--r-- | test/stdout/0377 | 1 | ||||
| -rw-r--r-- | test/stdout/0378 | 1 | ||||
| -rw-r--r-- | test/stdout/0379 | 1 | ||||
| -rw-r--r-- | test/stdout/0389 | 1 | ||||
| -rw-r--r-- | test/stdout/0488 | 1 | ||||
| -rw-r--r-- | test/stdout/0490 | 1 | ||||
| -rw-r--r-- | test/stdout/0514 | 1 | ||||
| -rw-r--r-- | test/stdout/0551 | 10 | ||||
| -rw-r--r-- | test/stdout/0578 | 4 | ||||
| -rw-r--r-- | test/stdout/0901 | 8 | ||||
| -rw-r--r-- | test/stdout/0906 | 123 | ||||
| -rw-r--r-- | test/stdout/2090 | 8 | ||||
| -rw-r--r-- | test/stdout/2190 | 8 | ||||
| -rw-r--r-- | test/stdout/3415 | 5 | ||||
| -rw-r--r-- | test/stdout/4027 | 66 | ||||
| -rw-r--r-- | test/stdout/4530 | 75 | ||||
| -rw-r--r-- | test/stdout/5840 | 14 |
27 files changed, 408 insertions, 33 deletions
diff --git a/test/stdout/0002 b/test/stdout/0002 index fa445b01c..5593f06cc 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -393,6 +393,8 @@ newline tab\134backslash ~tilde\177DEL\200\201. > isip: y 1.2.3.4 > isip4: y 1.2.3.4 > isip6: n 1.2.3.4 +> isip: n ::1.2.3.256 +> isip4: n 1.2.3.256 > isip: n 1:2:3:4 > isip4: n 1:2:3:4 > isip6: n 1:2:3:4 @@ -402,6 +404,7 @@ newline tab\134backslash ~tilde\177DEL\200\201. > isip: y fe80::a00:20ff:fe86:a061 > isip4: n fe80::a00:20ff:fe86:a061 > isip6: y fe80::a00:20ff:fe86:a061 +> isip: y fe80::1.2.3.4 > isip: n rhubarb > isip4: n rhubarb > isip6: n rhubarb diff --git a/test/stdout/0035 b/test/stdout/0035 index 6855c1d31..60e2c62d2 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -144,6 +144,7 @@ End of script EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -164,6 +165,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -187,6 +189,7 @@ dddF From: a@y EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -208,6 +211,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -229,6 +233,7 @@ dddS Sender: sender@some.where EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -253,6 +258,7 @@ dddF From: a@y EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -277,6 +283,7 @@ dddF From: a@y EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 diff --git a/test/stdout/0211 b/test/stdout/0211 index 2d484bda5..708632ded 100644 --- a/test/stdout/0211 +++ b/test/stdout/0211 @@ -43,3 +43,13 @@ EHLO the.local.host.name 550 You are banned HELO the.local.host.name End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +554 no smtp service here +QUIT +220 bye +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +*sleep 2 +End of script diff --git a/test/stdout/0227 b/test/stdout/0227 index ea8520ef1..9ee7e9f54 100644 --- a/test/stdout/0227 +++ b/test/stdout/0227 @@ -88,6 +88,33 @@ 250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello root at me [V4NET.0.0.3]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+550 relay not permitted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello root at me [V4NET.0.0.3]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+550 relay not permitted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello root at me [V4NET.0.0.7]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+550 relay not permitted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
550-Callout verification failed:
550 550 Recipient not liked
@@ -248,10 +275,10 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready EHLO myhost.test.ex -250- wotcher +250- wotcher sverifier 250-SIZE 250 OK -MAIL FROM:<> SIZE=ssss +MAIL FROM:<> 250 OK RCPT TO:<ok@localhost1> 250 OK @@ -261,6 +288,54 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready +EHLO myhost.test.ex +250- wotcher rverifier +250-SIZE +250 OK +MAIL FROM:<> SIZE=ssss +250 OK +RCPT TO:<z@remote.domain> +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250- wotcher rverifier +250-SIZE +250 OK +MAIL FROM:<> +250 OK +RCPT TO:<z@remote.domain> +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250- wotcher rverifier +250-SIZE +250 OK +MAIL FROM:<ok@localhost1> +250 OK +RCPT TO:<myhost.test.ex-dddddddd-testing@remote.domain> +550 RANDOM NOT OK +RSET +250 OK +MAIL FROM:<ok@localhost1> SIZE=ssss +250 OK +RCPT TO:<z@remote.domain> +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready LHLO myhost.test.ex 250 OK MAIL FROM:<> diff --git a/test/stdout/0245 b/test/stdout/0245 index 36332a61b..5d0f2df34 100644 --- a/test/stdout/0245 +++ b/test/stdout/0245 @@ -7,6 +7,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 1 diff --git a/test/stdout/0250 b/test/stdout/0250 index 1d364b4e9..c19185e84 100644 --- a/test/stdout/0250 +++ b/test/stdout/0250 @@ -2,6 +2,7 @@ CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -32,6 +33,7 @@ ddd* X-rewrote-sender: CALLER@test.ex CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -62,6 +64,7 @@ ddd* X-rewrote-sender: CALLER@test.ex CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0254 b/test/stdout/0254 index 3e044dd6f..69b80a192 100644 --- a/test/stdout/0254 +++ b/test/stdout/0254 @@ -2,6 +2,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -38,6 +39,7 @@ dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex> CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -67,6 +69,7 @@ dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex> CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0311 b/test/stdout/0311 index 45190072f..960e8e0b7 100644 --- a/test/stdout/0311 +++ b/test/stdout/0311 @@ -2,6 +2,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -30,6 +31,7 @@ dddF From: CALLER_NAME <CALLER@myhost.test.ex> CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0338 b/test/stdout/0338 index 52bd7ee37..fbbbc69c5 100644 --- a/test/stdout/0338 +++ b/test/stdout/0338 @@ -6,6 +6,7 @@ CALLER UID GID <CALLER@test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0376 b/test/stdout/0376 index 8c2b9685c..a0af2cb92 100644 --- a/test/stdout/0376 +++ b/test/stdout/0376 @@ -78,7 +78,7 @@ 221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
-451 Could not complete sender verify callout
+250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
@@ -86,7 +86,7 @@ 221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
-451 Could not complete sender verify callout
+250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
diff --git a/test/stdout/0377 b/test/stdout/0377 index 59742e666..de1e5e305 100644 --- a/test/stdout/0377 +++ b/test/stdout/0377 @@ -2,6 +2,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0378 b/test/stdout/0378 index e64fdef16..c60701cbc 100644 --- a/test/stdout/0378 +++ b/test/stdout/0378 @@ -2,6 +2,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0379 b/test/stdout/0379 index 7bfea116f..d26d23523 100644 --- a/test/stdout/0379 +++ b/test/stdout/0379 @@ -2,6 +2,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0389 b/test/stdout/0389 index 69b1bfc00..bb5977af7 100644 --- a/test/stdout/0389 +++ b/test/stdout/0389 @@ -8,6 +8,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local-smtp -aclm 0 22 diff --git a/test/stdout/0488 b/test/stdout/0488 index ff89ff2f7..d6d3b4b18 100644 --- a/test/stdout/0488 +++ b/test/stdout/0488 @@ -8,6 +8,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local-smtp -body_linecount 0 diff --git a/test/stdout/0490 b/test/stdout/0490 index f9cb83d19..ee77a71e6 100644 --- a/test/stdout/0490 +++ b/test/stdout/0490 @@ -12,6 +12,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident CALLER -received_protocol local-smtp -body_linecount 2 diff --git a/test/stdout/0514 b/test/stdout/0514 index 83111ea92..5b8677c65 100644 --- a/test/stdout/0514 +++ b/test/stdout/0514 @@ -5,6 +5,7 @@ CALLER UID GID <"spaced user"@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -ident spaced user -received_protocol local -body_linecount 1 diff --git a/test/stdout/0551 b/test/stdout/0551 index 8af281557..9b99fcc54 100644 --- a/test/stdout/0551 +++ b/test/stdout/0551 @@ -4,13 +4,13 @@ 1999-03-02 09:44:33 [1235] 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 [1236] 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 -1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 => userz <userz@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 QT=qqs +1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 => userz <userz@test.ex> R=r1 T=t1 QT=qqs 1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 QT=q.qqqs DT=q.qqqs +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed QT=q.qqqs exigrep exit code = 0 diff --git a/test/stdout/0578 b/test/stdout/0578 index 40b265041..d3089e7e4 100644 --- a/test/stdout/0578 +++ b/test/stdout/0578 @@ -78,7 +78,7 @@ 221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
-451 Could not complete sender verify callout
+250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
@@ -86,7 +86,7 @@ 221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
-451 Could not complete sender verify callout
+250 Accepted
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
diff --git a/test/stdout/0901 b/test/stdout/0901 index 99eb81231..a982ac8b6 100644 --- a/test/stdout/0901 +++ b/test/stdout/0901 @@ -324,14 +324,14 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-CHUNKING ??? 250 HELP <<< 250 HELP ->>> mail from:someone9@some.domain +>>> MAIL FROM:someone9@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@test.ex +>>> RCPT TO:CALLER@test.ex ??? 250 <<< 250 Accepted ->>> bdat 1\r\nTbdat 87 last ->>> To: Susan@random.com +>>> BDAT 1\r\nTBDAT 87 last +>>> o: Susan@random.com >>> From: Sam@random.com >>> Subject: This is a bodyless test message >>> diff --git a/test/stdout/0906 b/test/stdout/0906 new file mode 100644 index 000000000..0eb13cc3f --- /dev/null +++ b/test/stdout/0906 @@ -0,0 +1,123 @@ +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO test.com +??? 250- +<<< 250-testhost.test.ex Hello test.com [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-CHUNKING +??? 250 +<<< 250 HELP +>>> MAIL FROM:<sender@dom> +??? 250 +<<< 250 OK +>>> RCPT TO:<a@test.ex> +??? 250 +<<< 250 Accepted +>>> BDAT 8408 LAST +>>> Subject: foo +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +>>> .dot +>>> tail +??? 250- +<<< 250- 8408 byte chunk, total 8408 +??? 250 +<<< 250 OK id=10HmaY-0005vi-00 +>>> QUIT +End of script diff --git a/test/stdout/2090 b/test/stdout/2090 index 7bf70310a..f08abd10b 100644 --- a/test/stdout/2090 +++ b/test/stdout/2090 @@ -89,13 +89,7 @@ Succeeded in starting TLS <<< 250-CHUNKING ??? 250 HELP <<< 250 HELP ->>> MAIL FROM:<someone@some.domain> ->>> RCPT TO:<CALLER@test.ex> ->>> BDAT 88 LAST ->>> To: Susan@random.com ->>> From: Sam@random.com ->>> Subject: This is a bodyless test message ->>> +>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n ??? 250 <<< 250 OK ??? 250 diff --git a/test/stdout/2190 b/test/stdout/2190 index 9d386bdf7..e09556e69 100644 --- a/test/stdout/2190 +++ b/test/stdout/2190 @@ -91,13 +91,7 @@ Succeeded in starting TLS <<< 250-CHUNKING ??? 250 HELP <<< 250 HELP ->>> MAIL FROM:<someone@some.domain> ->>> RCPT TO:<CALLER@test.ex> ->>> BDAT 88 LAST ->>> To: Susan@random.com ->>> From: Sam@random.com ->>> Subject: This is a bodyless test message ->>> +>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n ??? 250 <<< 250 OK ??? 250 diff --git a/test/stdout/3415 b/test/stdout/3415 index f675c6c74..8e20252e2 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -155,6 +155,7 @@ End of script EXIMUSER EXIM_UID EXIM_GID <username@myhost.test.ex> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -181,6 +182,7 @@ dddS Sender: username@myhost.test.ex EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -205,6 +207,7 @@ dddF From: username@myhost.test.ex EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -229,6 +232,7 @@ dddF From: username@another.domain EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -253,6 +257,7 @@ dddF From: username@auth.id.domain EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 +-received_time_usec .uuuuuu -helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 diff --git a/test/stdout/4027 b/test/stdout/4027 new file mode 100644 index 000000000..74837c4ac --- /dev/null +++ b/test/stdout/4027 @@ -0,0 +1,66 @@ +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
+ +******** SERVER ******** +Listening on port 1225 ... +Connection request from [ip4.ip4.ip4.ip4] +<<\x05\x01\x00 +>>\x05\x00 +<<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8 +>>\x05\x00\x00\x01\x7f\x00\x00\x01\xbe\xef +220 Connected OK +EHLO +250-server id +250 +MAIL FROM +250 +RCPT TO +250 +DATA +354 do me +R +250 accepted OK +QUIT +250 bye +End of script +Listening on port 1225 ... +Connection request from [ip4.ip4.ip4.ip4] +<<\x05\x01\x00 +>>\x05\x00 +<<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8 +>>\x05\x00\x00\x01\x7f\x00\x00\x01\xbe\xef +220 Connected OK +EHLO +250-server id +250 +MAIL FROM +250 +RCPT TO +250 +DATA +354 do me mate +R +250 accepted OK +QUIT +250 bye +End of script diff --git a/test/stdout/4530 b/test/stdout/4530 new file mode 100644 index 000000000..9d64ae5f5 --- /dev/null +++ b/test/stdout/4530 @@ -0,0 +1,75 @@ +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO xxx +??? 250- +<<< 250-testhost.test.ex Hello xxx [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-CHUNKING +??? 250 +<<< 250 HELP +>>> MAIL FROM:<CALLER@bloggs.com> +??? 250 +<<< 250 OK +>>> RCPT TO:<z@test.ex> +??? 250 +<<< 250 Accepted +>>> DATA +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> Subject: simple test +>>> +>>> Line 1: This is a simple test. +>>> Line 2: This is a simple test. +>>> ..Line 3 has a leading dot +>>> last line: 4 +>>> . +??? 250 +<<< 250 OK id=10HmaZ-0005vi-00 +>>> QUIT +??? 221 +<<< 221 testhost.test.ex closing connection +End of script +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO xxx +??? 250- +<<< 250-testhost.test.ex Hello xxx [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-CHUNKING +??? 250 +<<< 250 HELP +>>> MAIL FROM:<CALLER@bloggs.com> +??? 250 +<<< 250 OK +>>> RCPT TO:<y@test.ex> +??? 250 +<<< 250 Accepted +>>> BDAT 129 LAST +>>> Subject: simple test +>>> +>>> Line 1: This is a simple test. +>>> Line 2: This is a simple test. +>>> .Line 3 has a leading dot +>>> last line: 4 +??? 250- +<<< 250- 129 byte chunk, total 129 +??? 250 +<<< 250 OK id=10HmbA-0005vi-00 +>>> QUIT +??? 221 +<<< 221 testhost.test.ex closing connection +End of script diff --git a/test/stdout/5840 b/test/stdout/5840 index 1d94564ad..32425d2e2 100644 --- a/test/stdout/5840 +++ b/test/stdout/5840 @@ -14,8 +14,11 @@ ### A server with a nonverifying cert and no TLSA ### A server with a verifying cert and no TLSA ### A server with two MXs for which both TLSA lookups return defer -### A server lacking a TLSA, required -### A server lacking a TLSA, requested only +### A server lacking a TLSA, dane required (should fail) +### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC) +### A server where the A is dnssec and the TLSA _fails_ +### A server securely saying "no TLSA records here", dane required (should fail) +### A server securely saying "no TLSA records here", dane requested only (should transmit) ******** SERVER ******** ### TLSA (3 1 1) @@ -25,5 +28,8 @@ ### A server with a nonverifying cert and no TLSA ### A server with a verifying cert and no TLSA ### A server with two MXs for which both TLSA lookups return defer -### A server lacking a TLSA, required -### A server lacking a TLSA, requested only +### A server lacking a TLSA, dane required (should fail) +### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC) +### A server where the A is dnssec and the TLSA _fails_ +### A server securely saying "no TLSA records here", dane required (should fail) +### A server securely saying "no TLSA records here", dane requested only (should transmit) |