From 225e8796145322dcebd4ea9df31f2315a5859853 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 23 Dec 2012 18:28:23 +0000 Subject: [PATCH] Testsuite updates to match PRDR advertisment at EHLO time; assumes EXPERIMENTAL_PRDR build, which probably is not wanted in the mainline yet. --- test/scripts/0000-Basic/0035 | 3 +++ test/scripts/0000-Basic/0159 | 4 ++++ test/scripts/0000-Basic/0282 | 2 ++ test/scripts/0000-Basic/0287 | 1 + test/scripts/0000-Basic/0300 | 5 +++++ test/scripts/0000-Basic/0301 | 3 +++ test/scripts/0000-Basic/0458 | 4 ++++ test/scripts/0000-Basic/0460 | 1 + test/scripts/0000-Basic/0547 | 18 ++++++++++-------- test/scripts/0000-Basic/0549 | 2 ++ test/scripts/0000-Basic/0556 | 3 +++ test/scripts/0000-Basic/0559 | 1 + test/scripts/0000-Basic/0562 | 2 ++ test/scripts/0000-Basic/0564 | 1 + test/scripts/1000-Basic-ipv6/1001 | 3 +++ test/scripts/2000-GnuTLS/2002 | 3 +++ test/scripts/2000-GnuTLS/2003 | 2 ++ test/scripts/2000-GnuTLS/2004 | 2 ++ test/scripts/2000-GnuTLS/2005 | 1 + test/scripts/2000-GnuTLS/2006 | 1 + test/scripts/2000-GnuTLS/2014 | 8 ++++++++ test/scripts/2000-GnuTLS/2015 | 1 + test/scripts/2000-GnuTLS/2018 | 2 ++ test/scripts/2000-GnuTLS/2019 | 1 + test/scripts/2000-GnuTLS/2022 | 1 + test/scripts/2000-GnuTLS/2024 | 2 ++ test/scripts/2000-GnuTLS/2028 | 2 ++ test/scripts/2000-GnuTLS/2029 | 1 + test/scripts/2100-OpenSSL/2102 | 3 +++ test/scripts/2100-OpenSSL/2103 | 2 ++ test/scripts/2100-OpenSSL/2104 | 2 ++ test/scripts/2100-OpenSSL/2105 | 1 + test/scripts/2100-OpenSSL/2106 | 1 + test/scripts/2100-OpenSSL/2114 | 8 ++++++++ test/scripts/2100-OpenSSL/2115 | 1 + test/scripts/2100-OpenSSL/2118 | 2 ++ test/scripts/2100-OpenSSL/2119 | 1 + test/scripts/2100-OpenSSL/2122 | 1 + test/scripts/2100-OpenSSL/2124 | 2 ++ test/scripts/2100-OpenSSL/2128 | 2 ++ test/scripts/2100-OpenSSL/2150 | 1 + test/scripts/3400-plaintext/3415 | 4 ++++ test/scripts/3450-plaintext-GnuTLS/3450 | 3 +++ test/scripts/3450-plaintext-GnuTLS/3453 | 2 ++ test/scripts/3450-plaintext-GnuTLS/3454 | 3 +++ test/scripts/3460-plaintext-OpenSSL/3460 | 3 +++ test/scripts/3460-plaintext-OpenSSL/3463 | 2 ++ test/scripts/3460-plaintext-OpenSSL/3464 | 3 +++ test/scripts/3600-SPA/3600 | 2 ++ test/stderr/0303 | 2 ++ test/stderr/0371 | 1 + test/stderr/0487 | 1 + test/stderr/2008 | 14 ++++++++++---- test/stderr/2013 | 8 ++++++-- test/stderr/2108 | 6 ++++++ test/stderr/2113 | 4 ++++ test/stderr/3400 | 1 + test/stderr/5410 | 4 ++++ test/stderr/5420 | 4 ++++ test/stdout/0019 | 1 + test/stdout/0028 | 1 + test/stdout/0034 | 11 +++++++++++ test/stdout/0035 | 6 ++++++ test/stdout/0038 | 6 ++++++ test/stdout/0043 | 1 + test/stdout/0044 | 2 ++ test/stdout/0070 | 1 + test/stdout/0079 | 3 +++ test/stdout/0080 | 1 + test/stdout/0138 | 2 ++ test/stdout/0159 | 8 ++++++++ test/stdout/0180 | 4 ++++ test/stdout/0181 | 1 + test/stdout/0243 | 1 + test/stdout/0282 | 4 ++++ test/stdout/0287 | 2 ++ test/stdout/0300 | 10 ++++++++++ test/stdout/0301 | 6 ++++++ test/stdout/0303 | 3 +++ test/stdout/0371 | 1 + test/stdout/0384 | 1 + test/stdout/0448 | 2 ++ test/stdout/0451 | 1 + test/stdout/0458 | 8 ++++++++ test/stdout/0460 | 2 ++ test/stdout/0473 | 10 ++++++++++ test/stdout/0485 | 1 + test/stdout/0486 | 1 + test/stdout/0487 | 1 + test/stdout/0495 | 2 ++ test/stdout/0513 | 1 + test/stdout/0524 | 4 ++++ test/stdout/0536 | 2 ++ test/stdout/0537 | 2 ++ test/stdout/0544 | 1 + test/stdout/0546 | 3 +++ test/stdout/0547 | 20 ++++++++++++-------- test/stdout/0549 | 4 ++++ test/stdout/0556 | 6 ++++++ test/stdout/0558 | 2 ++ test/stdout/0559 | 2 ++ test/stdout/0562 | 4 ++++ test/stdout/0564 | 2 ++ test/stdout/0566 | 14 ++++++++++++++ test/stdout/1001 | 6 ++++++ test/stdout/2002 | 6 ++++++ test/stdout/2003 | 4 ++++ test/stdout/2004 | 4 ++++ test/stdout/2005 | 2 ++ test/stdout/2006 | 2 ++ test/stdout/2014 | 16 ++++++++++++++++ test/stdout/2015 | 2 ++ test/stdout/2018 | 4 ++++ test/stdout/2019 | 2 ++ test/stdout/2022 | 2 ++ test/stdout/2023 | 1 + test/stdout/2024 | 4 ++++ test/stdout/2028 | 4 ++++ test/stdout/2029 | 2 ++ test/stdout/2102 | 6 ++++++ test/stdout/2103 | 4 ++++ test/stdout/2104 | 4 ++++ test/stdout/2105 | 2 ++ test/stdout/2106 | 2 ++ test/stdout/2114 | 16 ++++++++++++++++ test/stdout/2115 | 2 ++ test/stdout/2118 | 4 ++++ test/stdout/2119 | 2 ++ test/stdout/2122 | 2 ++ test/stdout/2123 | 1 + test/stdout/2124 | 4 ++++ test/stdout/2128 | 4 ++++ test/stdout/2150 | 2 ++ test/stdout/3000 | 2 ++ test/stdout/3208 | 1 + test/stdout/3400 | 22 ++++++++++++++++++++++ test/stdout/3402 | 2 ++ test/stdout/3403 | 1 + test/stdout/3406 | 4 ++++ test/stdout/3408 | 2 ++ test/stdout/3409 | 2 ++ test/stdout/3410 | 3 +++ test/stdout/3411 | 1 + test/stdout/3413 | 1 + test/stdout/3414 | 6 ++++++ test/stdout/3415 | 8 ++++++++ test/stdout/3450 | 6 ++++++ test/stdout/3453 | 4 ++++ test/stdout/3454 | 6 ++++++ test/stdout/3460 | 6 ++++++ test/stdout/3463 | 4 ++++ test/stdout/3464 | 6 ++++++ test/stdout/3500 | 5 +++++ test/stdout/3600 | 4 ++++ test/stdout/5204 | 1 + test/stdout/5400 | 3 +++ test/stdout/5401 | 1 + test/stdout/5410 | 3 +++ test/stdout/5420 | 3 +++ 159 files changed, 546 insertions(+), 22 deletions(-) diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035 index 147c8e7e2..8ffa10461 100644 --- a/test/scripts/0000-Basic/0035 +++ b/test/scripts/0000-Basic/0035 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 @@ -68,6 +69,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 @@ -93,6 +95,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/0000-Basic/0159 b/test/scripts/0000-Basic/0159 index b30ca90d6..252e85c9b 100644 --- a/test/scripts/0000-Basic/0159 +++ b/test/scripts/0000-Basic/0159 @@ -12,6 +12,7 @@ ehlo [HOSTIPV4] ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:<> ??? 250 @@ -29,6 +30,7 @@ ehlo [IPV4:HOSTIPV4] ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:<> ??? 250 @@ -46,6 +48,7 @@ ehlo HOSTIPV4 ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:<> ??? 250 @@ -63,6 +66,7 @@ ehlo [V4NET.1.2.3] ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:<> ??? 250 diff --git a/test/scripts/0000-Basic/0282 b/test/scripts/0000-Basic/0282 index d19464e12..8015586ac 100644 --- a/test/scripts/0000-Basic/0282 +++ b/test/scripts/0000-Basic/0282 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 @@ -30,6 +31,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/0000-Basic/0287 b/test/scripts/0000-Basic/0287 index 9aa9f52e2..562325acd 100644 --- a/test/scripts/0000-Basic/0287 +++ b/test/scripts/0000-Basic/0287 @@ -11,6 +11,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 ETRN one ??? 250 diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300 index 047dba410..69e5d1a47 100644 --- a/test/scripts/0000-Basic/0300 +++ b/test/scripts/0000-Basic/0300 @@ -17,6 +17,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 rset\r\nmail from:\r\nrcpt to:\r\ndata ??? 250 @@ -48,6 +49,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to: ??? 554 @@ -68,6 +70,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 rset\r\nquit ??? 250 @@ -80,6 +83,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 rset\r\nquit ??? 554 @@ -92,6 +96,7 @@ ehlo dis.able ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata\r\nthe message\r\nsecond line . diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301 index 08996c7ef..3fac3aef5 100644 --- a/test/scripts/0000-Basic/0301 +++ b/test/scripts/0000-Basic/0301 @@ -10,6 +10,7 @@ ehlo abcd\r\nmail from: ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 ??? 250 quit @@ -22,6 +23,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata ??? 250 @@ -46,6 +48,7 @@ ehlo en.force ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata\r\nthe message . diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458 index 062dec500..6e55ba08f 100644 --- a/test/scripts/0000-Basic/0458 +++ b/test/scripts/0000-Basic/0458 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 @@ -44,6 +45,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 550 @@ -78,6 +80,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 @@ -120,6 +123,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 rcpt to: ??? 503 diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460 index b91be2084..d36695dd4 100644 --- a/test/scripts/0000-Basic/0460 +++ b/test/scripts/0000-Basic/0460 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547 index 2595eff48..9be2aa4ea 100644 --- a/test/scripts/0000-Basic/0547 +++ b/test/scripts/0000-Basic/0547 @@ -14,10 +14,11 @@ quit client 127.0.0.1 PORT_D ??? 220 ehlo x.y.z -??? 250 -??? 250 -??? 250 -??? 250 +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- ??? 250 VRFY a@b.c ??? 252 @@ -27,10 +28,11 @@ quit client 127.0.0.1 PORT_D ??? 220 ehlo x.y.z -??? 250 -??? 250 -??? 250 -??? 250 +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- ??? 250 MAIL FROM:<> ??? 250 diff --git a/test/scripts/0000-Basic/0549 b/test/scripts/0000-Basic/0549 index 4126ae73f..5eda56613 100644 --- a/test/scripts/0000-Basic/0549 +++ b/test/scripts/0000-Basic/0549 @@ -9,6 +9,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 quit ??? 221 @@ -20,6 +21,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 quit ??? 221 diff --git a/test/scripts/0000-Basic/0556 b/test/scripts/0000-Basic/0556 index 2283c69b0..fead086d4 100644 --- a/test/scripts/0000-Basic/0556 +++ b/test/scripts/0000-Basic/0556 @@ -14,6 +14,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 rset\r\nmail from:\r\nrcpt to:\r\ndata +++ 1 @@ -35,6 +36,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: +++ 1 @@ -47,6 +49,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559 index 7ebc64d34..8a68c708c 100644 --- a/test/scripts/0000-Basic/0559 +++ b/test/scripts/0000-Basic/0559 @@ -10,6 +10,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata ??? 250 diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562 index 9355c46fc..0f7ff3e4a 100644 --- a/test/scripts/0000-Basic/0562 +++ b/test/scripts/0000-Basic/0562 @@ -10,6 +10,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata ??? 250 @@ -56,6 +57,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata ??? 250 diff --git a/test/scripts/0000-Basic/0564 b/test/scripts/0000-Basic/0564 index 68fb607ec..55be93a3c 100644 --- a/test/scripts/0000-Basic/0564 +++ b/test/scripts/0000-Basic/0564 @@ -10,6 +10,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata ??? 250 diff --git a/test/scripts/1000-Basic-ipv6/1001 b/test/scripts/1000-Basic-ipv6/1001 index d0a71a6cd..3170647e2 100644 --- a/test/scripts/1000-Basic-ipv6/1001 +++ b/test/scripts/1000-Basic-ipv6/1001 @@ -12,6 +12,7 @@ ehlo [HOSTIPV6] ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:<> ??? 250 @@ -29,6 +30,7 @@ ehlo [IPV6:HOSTIPV6] ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:<> ??? 250 @@ -46,6 +48,7 @@ ehlo [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062] ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from:<> ??? 250 diff --git a/test/scripts/2000-GnuTLS/2002 b/test/scripts/2000-GnuTLS/2002 index 06e1a8257..f8a7dccad 100644 --- a/test/scripts/2000-GnuTLS/2002 +++ b/test/scripts/2000-GnuTLS/2002 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -33,6 +34,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -45,6 +47,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2000-GnuTLS/2003 b/test/scripts/2000-GnuTLS/2003 index d4bcedd67..1635c6344 100644 --- a/test/scripts/2000-GnuTLS/2003 +++ b/test/scripts/2000-GnuTLS/2003 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -28,6 +29,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2000-GnuTLS/2004 b/test/scripts/2000-GnuTLS/2004 index a310bb6ec..6967d3b8f 100644 --- a/test/scripts/2000-GnuTLS/2004 +++ b/test/scripts/2000-GnuTLS/2004 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 @@ -26,6 +27,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/2000-GnuTLS/2005 b/test/scripts/2000-GnuTLS/2005 index a2164b327..f837cc44f 100644 --- a/test/scripts/2000-GnuTLS/2005 +++ b/test/scripts/2000-GnuTLS/2005 @@ -14,6 +14,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2000-GnuTLS/2006 b/test/scripts/2000-GnuTLS/2006 index 1da0f7ddc..a30146c5a 100644 --- a/test/scripts/2000-GnuTLS/2006 +++ b/test/scripts/2000-GnuTLS/2006 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014 index c5a01494a..88a269a7f 100644 --- a/test/scripts/2000-GnuTLS/2014 +++ b/test/scripts/2000-GnuTLS/2014 @@ -12,6 +12,7 @@ ehlo rhu1.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -25,6 +26,7 @@ ehlo rhu2.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -46,6 +48,7 @@ ehlo rhu3.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -65,6 +68,7 @@ ehlo rhu4.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -84,6 +88,7 @@ ehlo rhu5.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -97,6 +102,7 @@ ehlo rhu6.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -120,6 +126,7 @@ ehlo rhu7.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -133,6 +140,7 @@ ehlo rhu8.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2000-GnuTLS/2015 b/test/scripts/2000-GnuTLS/2015 index 140af797f..73fd837cb 100644 --- a/test/scripts/2000-GnuTLS/2015 +++ b/test/scripts/2000-GnuTLS/2015 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls_wait ??? 220 diff --git a/test/scripts/2000-GnuTLS/2018 b/test/scripts/2000-GnuTLS/2018 index ac6049fd8..dbb210570 100644 --- a/test/scripts/2000-GnuTLS/2018 +++ b/test/scripts/2000-GnuTLS/2018 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -33,6 +34,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/2000-GnuTLS/2019 b/test/scripts/2000-GnuTLS/2019 index d59f42ea2..ed6a75e6a 100644 --- a/test/scripts/2000-GnuTLS/2019 +++ b/test/scripts/2000-GnuTLS/2019 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/2000-GnuTLS/2022 b/test/scripts/2000-GnuTLS/2022 index b90361982..13f9d48d9 100644 --- a/test/scripts/2000-GnuTLS/2022 +++ b/test/scripts/2000-GnuTLS/2022 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2000-GnuTLS/2024 b/test/scripts/2000-GnuTLS/2024 index 7e16b7b05..b588e60ef 100644 --- a/test/scripts/2000-GnuTLS/2024 +++ b/test/scripts/2000-GnuTLS/2024 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -25,6 +26,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 454 diff --git a/test/scripts/2000-GnuTLS/2028 b/test/scripts/2000-GnuTLS/2028 index e5bb97b72..00eef36e1 100644 --- a/test/scripts/2000-GnuTLS/2028 +++ b/test/scripts/2000-GnuTLS/2028 @@ -12,6 +12,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -25,6 +26,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 quit ??? 221 diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029 index ab4f9491e..40ac3047e 100644 --- a/test/scripts/2000-GnuTLS/2029 +++ b/test/scripts/2000-GnuTLS/2029 @@ -14,6 +14,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102 index 7f9279acd..c9a0a8d58 100644 --- a/test/scripts/2100-OpenSSL/2102 +++ b/test/scripts/2100-OpenSSL/2102 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -32,6 +33,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -44,6 +46,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2103 b/test/scripts/2100-OpenSSL/2103 index 1018c4eb4..f188b23f6 100644 --- a/test/scripts/2100-OpenSSL/2103 +++ b/test/scripts/2100-OpenSSL/2103 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -27,6 +28,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2104 b/test/scripts/2100-OpenSSL/2104 index 55e54ddeb..45a0194ba 100644 --- a/test/scripts/2100-OpenSSL/2104 +++ b/test/scripts/2100-OpenSSL/2104 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 @@ -25,6 +26,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/2100-OpenSSL/2105 b/test/scripts/2100-OpenSSL/2105 index 130fa48d9..c61dae33a 100644 --- a/test/scripts/2100-OpenSSL/2105 +++ b/test/scripts/2100-OpenSSL/2105 @@ -13,6 +13,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2106 b/test/scripts/2100-OpenSSL/2106 index 3e36603a9..67982b0db 100644 --- a/test/scripts/2100-OpenSSL/2106 +++ b/test/scripts/2100-OpenSSL/2106 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2114 b/test/scripts/2100-OpenSSL/2114 index 9ba0bf925..f8cfd68d4 100644 --- a/test/scripts/2100-OpenSSL/2114 +++ b/test/scripts/2100-OpenSSL/2114 @@ -10,6 +10,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -23,6 +24,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -44,6 +46,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -63,6 +66,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -82,6 +86,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -95,6 +100,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -118,6 +124,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -131,6 +138,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2115 b/test/scripts/2100-OpenSSL/2115 index 9ecefdbac..7cb9e8864 100644 --- a/test/scripts/2100-OpenSSL/2115 +++ b/test/scripts/2100-OpenSSL/2115 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls_wait ??? 220 diff --git a/test/scripts/2100-OpenSSL/2118 b/test/scripts/2100-OpenSSL/2118 index 281060ca8..3be95b703 100644 --- a/test/scripts/2100-OpenSSL/2118 +++ b/test/scripts/2100-OpenSSL/2118 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -32,6 +33,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/2100-OpenSSL/2119 b/test/scripts/2100-OpenSSL/2119 index 1ad9befd7..37dc31257 100644 --- a/test/scripts/2100-OpenSSL/2119 +++ b/test/scripts/2100-OpenSSL/2119 @@ -8,6 +8,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 mail from: ??? 250 diff --git a/test/scripts/2100-OpenSSL/2122 b/test/scripts/2100-OpenSSL/2122 index b93013962..4d1233763 100644 --- a/test/scripts/2100-OpenSSL/2122 +++ b/test/scripts/2100-OpenSSL/2122 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2124 b/test/scripts/2100-OpenSSL/2124 index eb999d6bf..c065181f2 100644 --- a/test/scripts/2100-OpenSSL/2124 +++ b/test/scripts/2100-OpenSSL/2124 @@ -9,6 +9,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -24,6 +25,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 454 diff --git a/test/scripts/2100-OpenSSL/2128 b/test/scripts/2100-OpenSSL/2128 index b9d781a28..8e0e204ba 100644 --- a/test/scripts/2100-OpenSSL/2128 +++ b/test/scripts/2100-OpenSSL/2128 @@ -11,6 +11,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -24,6 +25,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 quit ??? 221 diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150 index 9ee9eb13f..3861f3e8c 100644 --- a/test/scripts/2100-OpenSSL/2150 +++ b/test/scripts/2100-OpenSSL/2150 @@ -12,6 +12,7 @@ ehlo abcd ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/3400-plaintext/3415 b/test/scripts/3400-plaintext/3415 index d5bcc33be..590a55c96 100644 --- a/test/scripts/3400-plaintext/3415 +++ b/test/scripts/3400-plaintext/3415 @@ -11,6 +11,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJuYW1lAG15c2VjcmV0 ??? 235 @@ -46,6 +47,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJuYW1lAG15c2VjcmV0 ??? 235 @@ -73,6 +75,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJuYW1lAG15c2VjcmV0 ??? 235 @@ -100,6 +103,7 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJuYW1lAG15c2VjcmV0 ??? 235 diff --git a/test/scripts/3450-plaintext-GnuTLS/3450 b/test/scripts/3450-plaintext-GnuTLS/3450 index 0494118ca..87ccbbf80 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3450 +++ b/test/scripts/3450-plaintext-GnuTLS/3450 @@ -11,6 +11,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 @@ -26,6 +27,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 503 @@ -37,6 +39,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 diff --git a/test/scripts/3450-plaintext-GnuTLS/3453 b/test/scripts/3450-plaintext-GnuTLS/3453 index a88f49f3d..27c56b7fc 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3453 +++ b/test/scripts/3450-plaintext-GnuTLS/3453 @@ -11,6 +11,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -33,6 +34,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/3450-plaintext-GnuTLS/3454 b/test/scripts/3450-plaintext-GnuTLS/3454 index 7ef007707..6ffa4cd00 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3454 +++ b/test/scripts/3450-plaintext-GnuTLS/3454 @@ -11,6 +11,7 @@ ehlo foobar ??? 250-PIPELINING ??? 250-AUTH ??? 250-STARTTLS +??? 250-PRDR ??? 250 HELP starttls ??? 220 TLS @@ -26,6 +27,7 @@ ehlo foobar ??? 250-PIPELINING ??? 250-AUTH ??? 250-STARTTLS +??? 250-PRDR ??? 250 HELP starttls ??? 220 TLS @@ -35,6 +37,7 @@ ehlo foobar ??? 250-8BITMIME ??? 250-PIPELINING ??? 250-AUTH +??? 250-PRDR ??? 250 HELP auth plain AHVzZXJ4AHNlY3JldA== ??? 235 diff --git a/test/scripts/3460-plaintext-OpenSSL/3460 b/test/scripts/3460-plaintext-OpenSSL/3460 index 98c7219cd..c06ddc83b 100644 --- a/test/scripts/3460-plaintext-OpenSSL/3460 +++ b/test/scripts/3460-plaintext-OpenSSL/3460 @@ -10,6 +10,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 @@ -25,6 +26,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 503 @@ -36,6 +38,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 diff --git a/test/scripts/3460-plaintext-OpenSSL/3463 b/test/scripts/3460-plaintext-OpenSSL/3463 index dd83449a9..8e4843e4f 100644 --- a/test/scripts/3460-plaintext-OpenSSL/3463 +++ b/test/scripts/3460-plaintext-OpenSSL/3463 @@ -10,6 +10,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -32,6 +33,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/3460-plaintext-OpenSSL/3464 b/test/scripts/3460-plaintext-OpenSSL/3464 index 997ae3056..6ec446234 100644 --- a/test/scripts/3460-plaintext-OpenSSL/3464 +++ b/test/scripts/3460-plaintext-OpenSSL/3464 @@ -10,6 +10,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -25,6 +26,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -34,6 +36,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 diff --git a/test/scripts/3600-SPA/3600 b/test/scripts/3600-SPA/3600 index 9f4f38941..78b7bd3a3 100644 --- a/test/scripts/3600-SPA/3600 +++ b/test/scripts/3600-SPA/3600 @@ -17,6 +17,7 @@ EHLO xxxx ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 AUTH NTLM ??? 334 @@ -33,6 +34,7 @@ EHLO xxxx ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 AUTH NTLM ??? 334 diff --git a/test/stderr/0303 b/test/stderr/0303 index bd6f78c4b..54ccb550e 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -77,6 +77,7 @@ SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP SMTP<< mail from:<> SMTP>> 250 OK @@ -146,6 +147,7 @@ SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP SMTP<< mail from:<> SMTP>> 250 OK diff --git a/test/stderr/0371 b/test/stderr/0371 index c4f9a93ac..b0a09ab9e 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -39,6 +39,7 @@ SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP SMTP<< mail from: using ACL "mail" diff --git a/test/stderr/0487 b/test/stderr/0487 index 448754ed5..883f0ee81 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -24,6 +24,7 @@ SMTP>> 250-myhost.test.ex Hello CALLER at x.y 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP SMTP<< mail from: SMTP>> 250 OK diff --git a/test/stderr/2008 b/test/stderr/2008 index b7686e26f..67697bf81 100644 --- a/test/stderr/2008 +++ b/test/stderr/2008 @@ -9,6 +9,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -17,6 +18,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -28,7 +30,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> QUIT LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 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) @@ -40,6 +42,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -48,6 +51,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -61,9 +65,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN - -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" + -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 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 @@ -72,6 +76,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -80,6 +85,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -91,7 +97,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected SMTP<< 250 OK id=10HmbB-0005vi-00 SMTP>> QUIT LOG: MAIN - => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" + => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 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 diff --git a/test/stderr/2013 b/test/stderr/2013 index d3cc39f7e..e9189c61b 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -11,6 +11,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -19,6 +20,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -33,9 +35,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" + => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN Completed Exim version x.yz .... @@ -49,6 +52,7 @@ admin user 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -59,7 +63,7 @@ admin user SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" + => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 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 terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2108 b/test/stderr/2108 index 743f7ba71..c03becfac 100644 --- a/test/stderr/2108 +++ b/test/stderr/2108 @@ -9,6 +9,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -17,6 +18,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -40,6 +42,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -48,6 +51,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -72,6 +76,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -80,6 +85,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: diff --git a/test/stderr/2113 b/test/stderr/2113 index 10c7e8022..72018c05f 100644 --- a/test/stderr/2113 +++ b/test/stderr/2113 @@ -11,6 +11,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP SMTP>> STARTTLS SMTP<< 220 TLS go ahead @@ -19,6 +20,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: @@ -33,6 +35,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" @@ -49,6 +52,7 @@ admin user 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: diff --git a/test/stderr/3400 b/test/stderr/3400 index 0a24b05fb..d3bad82a7 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -406,6 +406,7 @@ SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5] 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP SMTP<< auth mylogin dXNlcnggc2VjcmV0 mylogin authenticator server_condition: diff --git a/test/stderr/5410 b/test/stderr/5410 index f8b31a750..4a0690795 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -49,6 +49,7 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP expanding: $address_data result: userx @@ -85,6 +86,7 @@ expanding: ${if eq {$address_data}{userz}{*}{:}} 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SMTP<< 250 OK @@ -203,6 +205,7 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP expanding: $address_data result: usery @@ -335,6 +338,7 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP expanding: $address_data result: usery diff --git a/test/stderr/5420 b/test/stderr/5420 index e711184f5..afef6c783 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -49,6 +49,7 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP expanding: $address_data result: userx @@ -85,6 +86,7 @@ expanding: ${if eq {$address_data}{userz}{*}{:}} 250-SIZE 52428800 250-8BITMIME 250-PIPELINING + 250-PRDR 250 HELP SMTP>> MAIL FROM: SMTP<< 250 OK @@ -203,6 +205,7 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP expanding: $address_data result: usery @@ -335,6 +338,7 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS + 250-PRDR 250 HELP expanding: $address_data result: usery diff --git a/test/stdout/0019 b/test/stdout/0019 index 5559e27d2..4dfa0faf4 100644 --- a/test/stdout/0019 +++ b/test/stdout/0019 @@ -22,6 +22,7 @@ 250-8BITMIME 250-ETRN 250-PIPELINING +250-PRDR 250 HELP 503 sender not yet given 250 OK diff --git a/test/stdout/0028 b/test/stdout/0028 index 7b6c71023..d4edc622f 100644 --- a/test/stdout/0028 +++ b/test/stdout/0028 @@ -9,6 +9,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 SIZE value too big diff --git a/test/stdout/0034 b/test/stdout/0034 index db83cd005..8c5925615 100644 --- a/test/stdout/0034 +++ b/test/stdout/0034 @@ -9,21 +9,25 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250-myhost.test.ex Hello CALLER at a.b.c 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250-myhost.test.ex Hello CALLER at a.b.c 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250-myhost.test.ex Hello CALLER at a.b.c 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 554 Too many nonmail commands 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 @@ -54,6 +58,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -63,6 +68,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -72,6 +78,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -81,21 +88,25 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250-myhost.test.ex Hello CALLER at a.b.c 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250-myhost.test.ex Hello CALLER at a.b.c 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250-myhost.test.ex Hello CALLER at a.b.c 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 554 Too many nonmail commands 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0035 b/test/stdout/0035 index 6855c1d31..986f5b5af 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -90,6 +92,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -121,6 +125,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/0038 b/test/stdout/0038 index fec80a9ff..c3ba065fd 100644 --- a/test/stdout/0038 +++ b/test/stdout/0038 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -24,6 +25,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -40,6 +42,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -56,6 +59,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -72,6 +76,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -90,6 +95,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0043 b/test/stdout/0043 index c25b99168..40eb415ac 100644 --- a/test/stdout/0043 +++ b/test/stdout/0043 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550-Verification failed for diff --git a/test/stdout/0044 b/test/stdout/0044 index 1840508b6..50ccc44c4 100644 --- a/test/stdout/0044 +++ b/test/stdout/0044 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -28,6 +29,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0070 b/test/stdout/0070 index 18339e98a..016adf8a5 100644 --- a/test/stdout/0070 +++ b/test/stdout/0070 @@ -99,6 +99,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 helo not verified diff --git a/test/stdout/0079 b/test/stdout/0079 index 431357612..7a8e668a7 100644 --- a/test/stdout/0079 +++ b/test/stdout/0079 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -23,6 +24,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -34,6 +36,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0080 b/test/stdout/0080 index 65625dd3e..a21a334e6 100644 --- a/test/stdout/0080 +++ b/test/stdout/0080 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0138 b/test/stdout/0138 index 88b1b79e0..af39feda5 100644 --- a/test/stdout/0138 +++ b/test/stdout/0138 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -28,6 +29,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0159 b/test/stdout/0159 index fd6fc0bed..94d57e56f 100644 --- a/test/stdout/0159 +++ b/test/stdout/0159 @@ -10,6 +10,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -36,6 +38,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -62,6 +66,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -88,6 +94,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> diff --git a/test/stdout/0180 b/test/stdout/0180 index e2c14c4ab..dd38d39de 100644 --- a/test/stdout/0180 +++ b/test/stdout/0180 @@ -3,6 +3,7 @@ 250-SIZE 100 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 552 Message size exceeds maximum permitted 250 Reset OK @@ -22,6 +23,7 @@ 250-SIZE 500 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 221 myhost.test.ex closing connection @@ -34,6 +36,7 @@ 250-SIZE 600 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 221 myhost.test.ex closing connection 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 @@ -41,6 +44,7 @@ 250-SIZE 100 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 552 Message size exceeds maximum permitted 250 Reset OK diff --git a/test/stdout/0181 b/test/stdout/0181 index ae4da9034..229894e07 100644 --- a/test/stdout/0181 +++ b/test/stdout/0181 @@ -3,6 +3,7 @@ 250-SIZE 100 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0243 b/test/stdout/0243 index af7553042..393b475b4 100644 --- a/test/stdout/0243 +++ b/test/stdout/0243 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0282 b/test/stdout/0282 index abb6172b5..6b807da4e 100644 --- a/test/stdout/0282 +++ b/test/stdout/0282 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -41,6 +43,8 @@ Connecting to 127.0.0.1 port 1226 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/0287 b/test/stdout/0287 index 1fb1f8141..7908225f8 100644 --- a/test/stdout/0287 +++ b/test/stdout/0287 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-ETRN ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> ETRN one diff --git a/test/stdout/0300 b/test/stdout/0300 index e01188818..efb7b7e78 100644 --- a/test/stdout/0300 +++ b/test/stdout/0300 @@ -17,6 +17,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> rset\r\nmail from:\r\nrcpt to:\r\ndata @@ -61,6 +63,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to: @@ -89,6 +93,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> rset\r\nquit @@ -107,6 +113,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> rset\r\nquit @@ -125,6 +133,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to:\r\ndata\r\nthe message\r\nsecond line diff --git a/test/stdout/0301 b/test/stdout/0301 index 71f6af970..68a2501d4 100644 --- a/test/stdout/0301 +++ b/test/stdout/0301 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP ??? 250 @@ -30,6 +32,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to:\r\ndata @@ -68,6 +72,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to:\r\ndata\r\nthe message diff --git a/test/stdout/0303 b/test/stdout/0303 index 7b9a23b91..639fa7954 100644 --- a/test/stdout/0303 +++ b/test/stdout/0303 @@ -16,6 +16,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 221 myhost.test.ex closing connection @@ -36,6 +37,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -55,6 +57,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0371 b/test/stdout/0371 index 313432631..0e9fb8b87 100644 --- a/test/stdout/0371 +++ b/test/stdout/0371 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0384 b/test/stdout/0384 index e2c165c0b..9843faa6f 100644 --- a/test/stdout/0384 +++ b/test/stdout/0384 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 EHLO argument does not match calling host diff --git a/test/stdout/0448 b/test/stdout/0448 index 0a42e0ea2..ddb13bd66 100644 --- a/test/stdout/0448 +++ b/test/stdout/0448 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -14,6 +15,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0451 b/test/stdout/0451 index 92efc311a..2d6bea6be 100644 --- a/test/stdout/0451 +++ b/test/stdout/0451 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0458 b/test/stdout/0458 index 47d52c1ac..03b2a5ebc 100644 --- a/test/stdout/0458 +++ b/test/stdout/0458 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -64,6 +66,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -118,6 +122,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -184,6 +190,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> rcpt to: diff --git a/test/stdout/0460 b/test/stdout/0460 index 1a3462b85..f39b5db61 100644 --- a/test/stdout/0460 +++ b/test/stdout/0460 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/0473 b/test/stdout/0473 index 9fff9a601..8d7f0c5f8 100644 --- a/test/stdout/0473 +++ b/test/stdout/0473 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -26,6 +27,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -35,6 +37,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -44,6 +47,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550-Callout verification failed: @@ -54,6 +58,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 Previous (cached) callout verification failure @@ -63,6 +68,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550-Verification failed for @@ -76,6 +82,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550-Verification failed for @@ -87,6 +94,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -105,6 +113,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 451 Could not complete recipient verify callout @@ -114,6 +123,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 451 Could not complete recipient verify callout diff --git a/test/stdout/0485 b/test/stdout/0485 index 2fea10b6c..8f0f012e7 100644 --- a/test/stdout/0485 +++ b/test/stdout/0485 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0486 b/test/stdout/0486 index e76858efb..4b0a5948a 100644 --- a/test/stdout/0486 +++ b/test/stdout/0486 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0487 b/test/stdout/0487 index c8452793b..bf6d1f4b6 100644 --- a/test/stdout/0487 +++ b/test/stdout/0487 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0495 b/test/stdout/0495 index 5c48151b0..24db5382d 100644 --- a/test/stdout/0495 +++ b/test/stdout/0495 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -15,6 +16,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0513 b/test/stdout/0513 index d0fc6ede1..560c842a2 100644 --- a/test/stdout/0513 +++ b/test/stdout/0513 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 451 >all relevant MX records point to non-existent hosts< ++++ diff --git a/test/stdout/0524 b/test/stdout/0524 index fad288a29..4143fe4c8 100644 --- a/test/stdout/0524 +++ b/test/stdout/0524 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Reset OK @@ -15,6 +16,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 550 CSA status is fail 221 myhost.test.ex closing connection @@ -28,6 +30,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 550 CSA status is fail 250 Reset OK @@ -35,6 +38,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 550 CSA status is fail 221 myhost.test.ex closing connection diff --git a/test/stdout/0536 b/test/stdout/0536 index ff1beab89..8bc415dbe 100644 --- a/test/stdout/0536 +++ b/test/stdout/0536 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 No code @@ -33,6 +34,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 No code diff --git a/test/stdout/0537 b/test/stdout/0537 index afbab0d29..62e60252f 100644 --- a/test/stdout/0537 +++ b/test/stdout/0537 @@ -15,6 +15,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Reset OK @@ -25,6 +26,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Reset OK diff --git a/test/stdout/0544 b/test/stdout/0544 index d267fea04..a306faaed 100644 --- a/test/stdout/0544 +++ b/test/stdout/0544 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/0546 b/test/stdout/0546 index c1fc53b5e..cc57ab79a 100644 --- a/test/stdout/0546 +++ b/test/stdout/0546 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 299-MAIL is 299 OK @@ -15,6 +16,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 299-MAIL is 299 OK @@ -25,5 +27,6 @@ 299-SIZE 52428800 299-8BITMIME 299-PIPELINING +299-PRDR 299 HELP 221 the.local.host.name closing connection diff --git a/test/stdout/0547 b/test/stdout/0547 index 7e931992c..b7f749c37 100644 --- a/test/stdout/0547 +++ b/test/stdout/0547 @@ -13,14 +13,16 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo x.y.z -??? 250 +??? 250- <<< 250-myhost.test.ex Hello x.y.z [127.0.0.1] -??? 250 +??? 250- <<< 250-SIZE 52428800 -??? 250 +??? 250- <<< 250-8BITMIME -??? 250 +??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> VRFY a@b.c @@ -34,14 +36,16 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo x.y.z -??? 250 +??? 250- <<< 250-myhost.test.ex Hello x.y.z [127.0.0.1] -??? 250 +??? 250- <<< 250-SIZE 52428800 -??? 250 +??? 250- <<< 250-8BITMIME -??? 250 +??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> MAIL FROM:<> diff --git a/test/stdout/0549 b/test/stdout/0549 index 7609d5146..382392c45 100644 --- a/test/stdout/0549 +++ b/test/stdout/0549 @@ -8,6 +8,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> quit @@ -26,6 +28,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> quit diff --git a/test/stdout/0556 b/test/stdout/0556 index 73046aaa2..1be7b1da7 100644 --- a/test/stdout/0556 +++ b/test/stdout/0556 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> rset\r\nmail from:\r\nrcpt to:\r\ndata @@ -34,6 +36,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -52,6 +56,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/0558 b/test/stdout/0558 index b80b14933..adfae0a32 100644 --- a/test/stdout/0558 +++ b/test/stdout/0558 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550-Default deny message @@ -21,6 +22,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550-Default deny message diff --git a/test/stdout/0559 b/test/stdout/0559 index b5cc62c49..bdc2ce330 100644 --- a/test/stdout/0559 +++ b/test/stdout/0559 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to:\r\ndata diff --git a/test/stdout/0562 b/test/stdout/0562 index 693fddace..8d05c516c 100644 --- a/test/stdout/0562 +++ b/test/stdout/0562 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to:\r\ndata @@ -78,6 +80,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to:\r\ndata diff --git a/test/stdout/0564 b/test/stdout/0564 index 6f4f06bdb..d1e6681cb 100644 --- a/test/stdout/0564 +++ b/test/stdout/0564 @@ -10,6 +10,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:\r\nrcpt to:\r\ndata diff --git a/test/stdout/0566 b/test/stdout/0566 index d3465d49e..a6982e1b6 100644 --- a/test/stdout/0566 +++ b/test/stdout/0566 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -12,6 +13,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -21,6 +23,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -30,6 +33,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -39,6 +43,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -48,6 +53,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -57,6 +63,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -66,6 +73,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -75,6 +83,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 SIZE value too big @@ -84,6 +93,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 SIZE value too big @@ -93,6 +103,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -104,6 +115,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -115,6 +127,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -126,6 +139,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 501 invalid data for BODY 503 sender not yet given diff --git a/test/stdout/1001 b/test/stdout/1001 index 7ba8eb07c..bf987a746 100644 --- a/test/stdout/1001 +++ b/test/stdout/1001 @@ -10,6 +10,8 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -36,6 +38,8 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -62,6 +66,8 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> diff --git a/test/stdout/2002 b/test/stdout/2002 index 7b2a47fca..27a573fb2 100644 --- a/test/stdout/2002 +++ b/test/stdout/2002 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -50,6 +52,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -74,6 +78,8 @@ Key file = TESTSUITE/aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2003 b/test/stdout/2003 index 3176f19e6..ca862195d 100644 --- a/test/stdout/2003 +++ b/test/stdout/2003 @@ -12,6 +12,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -43,6 +45,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2004 b/test/stdout/2004 index ac5245cba..d6222afe9 100644 --- a/test/stdout/2004 +++ b/test/stdout/2004 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -38,6 +40,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/2005 b/test/stdout/2005 index 7a0430c10..f8eca36c2 100644 --- a/test/stdout/2005 +++ b/test/stdout/2005 @@ -18,6 +18,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2006 b/test/stdout/2006 index ba53967e0..1c690c09d 100644 --- a/test/stdout/2006 +++ b/test/stdout/2006 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2014 b/test/stdout/2014 index 56c959f20..685fd2cf0 100644 --- a/test/stdout/2014 +++ b/test/stdout/2014 @@ -12,6 +12,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -34,6 +36,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -70,6 +74,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -103,6 +109,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -136,6 +144,8 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -160,6 +170,8 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -195,6 +207,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -219,6 +233,8 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2015 b/test/stdout/2015 index fd6174058..0c2d77305 100644 --- a/test/stdout/2015 +++ b/test/stdout/2015 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2018 b/test/stdout/2018 index c7a0df4c4..7997f084c 100644 --- a/test/stdout/2018 +++ b/test/stdout/2018 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -50,6 +52,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/2019 b/test/stdout/2019 index b885461ed..6a7361011 100644 --- a/test/stdout/2019 +++ b/test/stdout/2019 @@ -12,6 +12,8 @@ Succeeded in starting TLS <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/2022 b/test/stdout/2022 index c6124c698..752d8c747 100644 --- a/test/stdout/2022 +++ b/test/stdout/2022 @@ -12,6 +12,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2023 b/test/stdout/2023 index 5022d27b3..cf2cc6af4 100644 --- a/test/stdout/2023 +++ b/test/stdout/2023 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 550 Administrative prohibition 221 myhost.test.ex closing connection diff --git a/test/stdout/2024 b/test/stdout/2024 index 2e30f7dd6..de585a792 100644 --- a/test/stdout/2024 +++ b/test/stdout/2024 @@ -14,6 +14,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -38,6 +40,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2028 b/test/stdout/2028 index 1ccd96b88..551c884f4 100644 --- a/test/stdout/2028 +++ b/test/stdout/2028 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -37,6 +39,8 @@ Succeeded in starting TLS <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> quit diff --git a/test/stdout/2029 b/test/stdout/2029 index 28be7c421..691ddcba9 100644 --- a/test/stdout/2029 +++ b/test/stdout/2029 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2102 b/test/stdout/2102 index d3c18a8bf..a6132d974 100644 --- a/test/stdout/2102 +++ b/test/stdout/2102 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -66,6 +68,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -106,6 +110,8 @@ Key file = TESTSUITE/aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2103 b/test/stdout/2103 index 1c2f41881..dc7b135e8 100644 --- a/test/stdout/2103 +++ b/test/stdout/2103 @@ -12,6 +12,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -59,6 +61,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2104 b/test/stdout/2104 index ac5245cba..d6222afe9 100644 --- a/test/stdout/2104 +++ b/test/stdout/2104 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -38,6 +40,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/2105 b/test/stdout/2105 index a9eb350be..31a9836e8 100644 --- a/test/stdout/2105 +++ b/test/stdout/2105 @@ -18,6 +18,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2106 b/test/stdout/2106 index cae6e21c8..597031fce 100644 --- a/test/stdout/2106 +++ b/test/stdout/2106 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2114 b/test/stdout/2114 index 35a696915..35ca36e85 100644 --- a/test/stdout/2114 +++ b/test/stdout/2114 @@ -12,6 +12,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -50,6 +52,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -104,6 +108,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -156,6 +162,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -208,6 +216,8 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -249,6 +259,8 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -303,6 +315,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -344,6 +358,8 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2115 b/test/stdout/2115 index fd6174058..0c2d77305 100644 --- a/test/stdout/2115 +++ b/test/stdout/2115 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2118 b/test/stdout/2118 index 1709dee8a..fd146d8f6 100644 --- a/test/stdout/2118 +++ b/test/stdout/2118 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -66,6 +68,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/2119 b/test/stdout/2119 index 0bcff273b..30e93df1f 100644 --- a/test/stdout/2119 +++ b/test/stdout/2119 @@ -28,6 +28,8 @@ Succeeded in starting TLS <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: diff --git a/test/stdout/2122 b/test/stdout/2122 index 4bb927032..17c219624 100644 --- a/test/stdout/2122 +++ b/test/stdout/2122 @@ -12,6 +12,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2123 b/test/stdout/2123 index 5022d27b3..cf2cc6af4 100644 --- a/test/stdout/2123 +++ b/test/stdout/2123 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 550 Administrative prohibition 221 myhost.test.ex closing connection diff --git a/test/stdout/2124 b/test/stdout/2124 index d2d83d5b6..131d3a7c6 100644 --- a/test/stdout/2124 +++ b/test/stdout/2124 @@ -14,6 +14,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -55,6 +57,8 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/2128 b/test/stdout/2128 index 795f469d1..0b45037ff 100644 --- a/test/stdout/2128 +++ b/test/stdout/2128 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -69,6 +71,8 @@ Succeeded in starting TLS <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> quit diff --git a/test/stdout/2150 b/test/stdout/2150 index 2f5596499..24bfc22dc 100644 --- a/test/stdout/2150 +++ b/test/stdout/2150 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/3000 b/test/stdout/3000 index 4ee74c877..74e02f4b2 100644 --- a/test/stdout/3000 +++ b/test/stdout/3000 @@ -31,6 +31,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -45,6 +46,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/3208 b/test/stdout/3208 index 2254a7ea3..f788c8ee8 100644 --- a/test/stdout/3208 +++ b/test/stdout/3208 @@ -8,6 +8,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/3400 b/test/stdout/3400 index 67add4d54..94fb810a1 100644 --- a/test/stdout/3400 +++ b/test/stdout/3400 @@ -23,6 +23,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 252 authentication required 550 authentication required @@ -56,6 +57,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 250 OK 550 authentication required @@ -72,6 +74,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 250 OK 250 Accepted @@ -105,6 +108,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 235 Authentication succeeded 221 myhost.test.ex closing connection @@ -116,6 +120,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 435 Unable to authenticate at present: account suspended 221 myhost.test.ex closing connection @@ -127,6 +132,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 535 Incorrect authentication data 500 unrecognized command @@ -139,6 +145,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 334 VXNlciBOYW1l 334 UGFzc3dvcmQ= @@ -156,6 +163,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 334 VXNlciBOYW1l 235 Authentication succeeded @@ -168,6 +176,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 235 Authentication succeeded 221 myhost.test.ex closing connection @@ -179,6 +188,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 334 UGFzc3dvcmQ= 235 Authentication succeeded @@ -191,6 +201,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 334 VXNlciBOYW1l 334 UGFzc3dvcmQ= @@ -208,6 +219,7 @@ 250-ETRN 250-EXPN 250-PIPELINING +250-PRDR 250 HELP 221 myhost.test.ex closing connection 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 @@ -218,6 +230,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 535 Incorrect authentication data 221 myhost.test.ex closing connection @@ -229,6 +242,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 334 235 Authentication succeeded @@ -241,6 +255,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 334 bXlob3N0LnRlc3QuZXg= 235 Authentication succeeded @@ -253,6 +268,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 435 Unable to authenticate at present 500 unrecognized command @@ -264,6 +280,7 @@ 250-ETRN 250-EXPN 250-PIPELINING +250-PRDR 250 HELP 503 AUTH command used when not advertised 500 unrecognized command @@ -276,6 +293,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 535 Incorrect authentication data 535 Incorrect authentication data @@ -307,6 +325,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 250 OK 250 Accepted @@ -331,6 +350,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 334 VXNlciBOYW1l 334 UGFzc3dvcmQ= @@ -344,6 +364,7 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN +250-PRDR 250 HELP 235 Authentication succeeded 221 myhost.test.ex closing connection @@ -354,6 +375,7 @@ 250-ETRN 250-EXPN 250-PIPELINING +250-PRDR 250 HELP 334 235 Authentication succeeded diff --git a/test/stdout/3402 b/test/stdout/3402 index 444d46c06..50d520e7b 100644 --- a/test/stdout/3402 +++ b/test/stdout/3402 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -14,6 +15,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK diff --git a/test/stdout/3403 b/test/stdout/3403 index 299e3ca67..bb641d314 100644 --- a/test/stdout/3403 +++ b/test/stdout/3403 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 535 Incorrect authentication data 235 Authentication succeeded diff --git a/test/stdout/3406 b/test/stdout/3406 index 81d58e350..99defe814 100644 --- a/test/stdout/3406 +++ b/test/stdout/3406 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH FIRST +250-PRDR 250 HELP 235 Authentication succeeded 221 myhost.test.ex closing connection @@ -13,6 +14,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH SECOND +250-PRDR 250 HELP 504 first authentication mechanism not supported 221 myhost.test.ex closing connection @@ -22,6 +24,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH FIRST +250-PRDR 250 HELP 504 second authentication mechanism not supported 221 myhost.test.ex closing connection @@ -31,6 +34,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH SECOND +250-PRDR 250 HELP 235 Authentication succeeded 221 myhost.test.ex closing connection diff --git a/test/stdout/3408 b/test/stdout/3408 index b5fffd08e..1846c39b4 100644 --- a/test/stdout/3408 +++ b/test/stdout/3408 @@ -9,6 +9,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 250 OK 250 Accepted @@ -30,6 +31,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK diff --git a/test/stdout/3409 b/test/stdout/3409 index ae2912f20..ce9f69759 100644 --- a/test/stdout/3409 +++ b/test/stdout/3409 @@ -5,6 +5,7 @@ 250-ETRN 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 501 invalid character in authentication mechanism name 235 Authentication succeeded @@ -18,6 +19,7 @@ 250-ETRN 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 250 OK 503 not permitted in mail transaction diff --git a/test/stdout/3410 b/test/stdout/3410 index 5c356db81..6bf73b93c 100644 --- a/test/stdout/3410 +++ b/test/stdout/3410 @@ -12,6 +12,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN LOGIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -31,6 +32,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN LOGIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -47,6 +49,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN LOGIN +250-PRDR 250 HELP 334 VXNlciBOYW1l 334 UGFzc3dvcmQ= diff --git a/test/stdout/3411 b/test/stdout/3411 index 14230657d..01fc31727 100644 --- a/test/stdout/3411 +++ b/test/stdout/3411 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK diff --git a/test/stdout/3413 b/test/stdout/3413 index 5370c5e40..d9915d07f 100644 --- a/test/stdout/3413 +++ b/test/stdout/3413 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 504 rhubarb authentication mechanism not supported 504 rhubarb authentication mechanism not supported diff --git a/test/stdout/3414 b/test/stdout/3414 index a96858c19..93927a120 100644 --- a/test/stdout/3414 +++ b/test/stdout/3414 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 250 OK 221 myhost.test.ex closing connection @@ -13,6 +14,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 250 OK 221 myhost.test.ex closing connection @@ -22,6 +24,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 250 OK 221 myhost.test.ex closing connection @@ -31,6 +34,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -41,6 +45,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -51,6 +56,7 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN +250-PRDR 250 HELP 250 OK 250 Reset OK diff --git a/test/stdout/3415 b/test/stdout/3415 index f675c6c74..899f2910f 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -12,6 +12,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJuYW1lAG15c2VjcmV0 @@ -59,6 +61,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJuYW1lAG15c2VjcmV0 @@ -94,6 +98,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJuYW1lAG15c2VjcmV0 @@ -129,6 +135,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJuYW1lAG15c2VjcmV0 diff --git a/test/stdout/3450 b/test/stdout/3450 index 1bd2e21d2..e94f2ead8 100644 --- a/test/stdout/3450 +++ b/test/stdout/3450 @@ -14,6 +14,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -39,6 +41,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -75,6 +79,8 @@ Succeeded in starting TLS <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== diff --git a/test/stdout/3453 b/test/stdout/3453 index 098973d42..dc8155dab 100644 --- a/test/stdout/3453 +++ b/test/stdout/3453 @@ -14,6 +14,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -47,6 +49,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/3454 b/test/stdout/3454 index ae2eab337..574f58fac 100644 --- a/test/stdout/3454 +++ b/test/stdout/3454 @@ -14,6 +14,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250-STARTTLS <<< 250-STARTTLS +??? 250-PRDR +<<< 250-PRDR ??? 250 HELP <<< 250 HELP >>> starttls @@ -56,6 +58,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250-STARTTLS <<< 250-STARTTLS +??? 250-PRDR +<<< 250-PRDR ??? 250 HELP <<< 250 HELP >>> starttls @@ -89,6 +93,8 @@ Succeeded in starting TLS <<< 250-PIPELINING ??? 250-AUTH <<< 250-AUTH PLAIN +??? 250-PRDR +<<< 250-PRDR ??? 250 HELP <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== diff --git a/test/stdout/3460 b/test/stdout/3460 index 92c47970f..4b6179f78 100644 --- a/test/stdout/3460 +++ b/test/stdout/3460 @@ -14,6 +14,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -39,6 +41,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -76,6 +80,8 @@ Succeeded in starting TLS <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== diff --git a/test/stdout/3463 b/test/stdout/3463 index 68b1b55c0..cb6132175 100644 --- a/test/stdout/3463 +++ b/test/stdout/3463 @@ -14,6 +14,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -63,6 +65,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls diff --git a/test/stdout/3464 b/test/stdout/3464 index 46f1c3729..f5798dcaf 100644 --- a/test/stdout/3464 +++ b/test/stdout/3464 @@ -14,6 +14,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -57,6 +59,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -91,6 +95,8 @@ Succeeded in starting TLS <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== diff --git a/test/stdout/3500 b/test/stdout/3500 index 634ac1ecd..5e2eb83bf 100644 --- a/test/stdout/3500 +++ b/test/stdout/3500 @@ -6,6 +6,7 @@ 250-EXPN 250-PIPELINING 250-AUTH CRAM-MD5 +250-PRDR 250 HELP 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ 235 Authentication succeeded @@ -22,6 +23,7 @@ 250-EXPN 250-PIPELINING 250-AUTH CRAM-MD5 +250-PRDR 250 HELP 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ 235 Authentication succeeded @@ -38,6 +40,7 @@ 250-ETRN 250-EXPN 250-PIPELINING +250-PRDR 250 HELP 221 myhost.test.ex closing connection @@ -53,6 +56,7 @@ 250-EXPN 250-PIPELINING 250-AUTH CRAM-MD5 +250-PRDR 250 HELP 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ 235 Authentication succeeded @@ -77,6 +81,7 @@ 250-EXPN 250-PIPELINING 250-AUTH CRAM-MD5 +250-PRDR 250 HELP 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ 535 Incorrect authentication data diff --git a/test/stdout/3600 b/test/stdout/3600 index 7d3707945..db6435978 100644 --- a/test/stdout/3600 +++ b/test/stdout/3600 @@ -13,6 +13,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH NTLMX NTLM +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> AUTH NTLM @@ -39,6 +41,8 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH NTLMX NTLM +??? 250- +<<< 250-PRDR ??? 250 <<< 250 HELP >>> AUTH NTLM diff --git a/test/stdout/5204 b/test/stdout/5204 index 532eb41d7..8ce7a2ef8 100644 --- a/test/stdout/5204 +++ b/test/stdout/5204 @@ -23,6 +23,7 @@ postmaster@test.ex 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 550 cannot route this one (FAIL) diff --git a/test/stdout/5400 b/test/stdout/5400 index 74c2d2358..d8268d8cb 100644 --- a/test/stdout/5400 +++ b/test/stdout/5400 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -14,6 +15,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted @@ -25,6 +27,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/5401 b/test/stdout/5401 index 1ceb0bffb..72b6e3ed2 100644 --- a/test/stdout/5401 +++ b/test/stdout/5401 @@ -3,6 +3,7 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/5410 b/test/stdout/5410 index edf01f8ba..7b81b220c 100644 --- a/test/stdout/5410 +++ b/test/stdout/5410 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 250 OK 250 Accepted @@ -16,6 +17,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 250 OK 250 Accepted @@ -28,6 +30,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 250 OK 250 Accepted diff --git a/test/stdout/5420 b/test/stdout/5420 index edf01f8ba..7b81b220c 100644 --- a/test/stdout/5420 +++ b/test/stdout/5420 @@ -4,6 +4,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 250 OK 250 Accepted @@ -16,6 +17,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 250 OK 250 Accepted @@ -28,6 +30,7 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS +250-PRDR 250 HELP 250 OK 250 Accepted -- 2.25.1