From c9b67df03f11cbd5f680f7f2d7ba67b72c61d790 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 13 Jan 2013 17:08:53 +0000 Subject: [PATCH] Default prdr_enabled to false, so that most testsuite cases work unchanged. This is probably how we want it until PRDR goes non-EXPERIMENTAL. --- src/src/globals.c | 5 ++--- src/src/globals.h | 2 +- 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 | 6 ------ test/stderr/2013 | 4 ---- 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 --- 161 files changed, 19 insertions(+), 544 deletions(-) diff --git a/src/src/globals.c b/src/src/globals.c index 73bd330ba..f4f1a7395 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -147,10 +147,9 @@ uschar *tls_verify_hosts = NULL; #ifdef EXPERIMENTAL_PRDR /* Per Recipient Data Response variables */ -BOOL prdr_enable = TRUE; +BOOL prdr_enable = FALSE; BOOL prdr_requested = FALSE; -//recipient_item *prdr_recipients_list = NULL; -const pcre *regex_PRDR = NULL; +pcre *regex_PRDR = NULL; #endif /* Input-reading functions for messages, so we can use special ones for diff --git a/src/src/globals.h b/src/src/globals.h index 03b6792d1..330c557d7 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -149,7 +149,7 @@ extern uschar *acl_smtp_connect; /* ACL run on SMTP connection */ extern uschar *acl_smtp_data; /* ACL run after DATA received */ #ifdef EXPERIMENTAL_PRDR extern uschar *acl_smtp_data_prdr; /* ACL run after DATA received if in PRDR mode*/ -extern const pcre *regex_PRDR; /* For recognizing PRDR settings */ +extern pcre *regex_PRDR; /* For recognizing PRDR settings */ #endif #ifndef DISABLE_DKIM extern uschar *acl_smtp_dkim; /* ACL run for DKIM signatures / domains */ diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035 index 8ffa10461..147c8e7e2 100644 --- a/test/scripts/0000-Basic/0035 +++ b/test/scripts/0000-Basic/0035 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 250 @@ -69,7 +68,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 250 @@ -95,7 +93,6 @@ 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 252e85c9b..b30ca90d6 100644 --- a/test/scripts/0000-Basic/0159 +++ b/test/scripts/0000-Basic/0159 @@ -12,7 +12,6 @@ ehlo [HOSTIPV4] ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:<> ??? 250 @@ -30,7 +29,6 @@ ehlo [IPV4:HOSTIPV4] ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:<> ??? 250 @@ -48,7 +46,6 @@ ehlo HOSTIPV4 ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:<> ??? 250 @@ -66,7 +63,6 @@ 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 8015586ac..d19464e12 100644 --- a/test/scripts/0000-Basic/0282 +++ b/test/scripts/0000-Basic/0282 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 250 @@ -31,7 +30,6 @@ 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 562325acd..9aa9f52e2 100644 --- a/test/scripts/0000-Basic/0287 +++ b/test/scripts/0000-Basic/0287 @@ -11,7 +11,6 @@ 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 69e5d1a47..047dba410 100644 --- a/test/scripts/0000-Basic/0300 +++ b/test/scripts/0000-Basic/0300 @@ -17,7 +17,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 rset\r\nmail from:\r\nrcpt to:\r\ndata ??? 250 @@ -49,7 +48,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:\r\nrcpt to: ??? 554 @@ -70,7 +68,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 rset\r\nquit ??? 250 @@ -83,7 +80,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 rset\r\nquit ??? 554 @@ -96,7 +92,6 @@ 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 3fac3aef5..08996c7ef 100644 --- a/test/scripts/0000-Basic/0301 +++ b/test/scripts/0000-Basic/0301 @@ -10,7 +10,6 @@ ehlo abcd\r\nmail from: ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 ??? 250 quit @@ -23,7 +22,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata ??? 250 @@ -48,7 +46,6 @@ 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 6e55ba08f..062dec500 100644 --- a/test/scripts/0000-Basic/0458 +++ b/test/scripts/0000-Basic/0458 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 250 @@ -45,7 +44,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 550 @@ -80,7 +78,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 250 @@ -123,7 +120,6 @@ 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 d36695dd4..b91be2084 100644 --- a/test/scripts/0000-Basic/0460 +++ b/test/scripts/0000-Basic/0460 @@ -10,7 +10,6 @@ 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 9be2aa4ea..2595eff48 100644 --- a/test/scripts/0000-Basic/0547 +++ b/test/scripts/0000-Basic/0547 @@ -14,11 +14,10 @@ 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 @@ -28,11 +27,10 @@ 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 5eda56613..4126ae73f 100644 --- a/test/scripts/0000-Basic/0549 +++ b/test/scripts/0000-Basic/0549 @@ -9,7 +9,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 quit ??? 221 @@ -21,7 +20,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 quit ??? 221 diff --git a/test/scripts/0000-Basic/0556 b/test/scripts/0000-Basic/0556 index fead086d4..2283c69b0 100644 --- a/test/scripts/0000-Basic/0556 +++ b/test/scripts/0000-Basic/0556 @@ -14,7 +14,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 rset\r\nmail from:\r\nrcpt to:\r\ndata +++ 1 @@ -36,7 +35,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: +++ 1 @@ -49,7 +47,6 @@ 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 8a68c708c..7ebc64d34 100644 --- a/test/scripts/0000-Basic/0559 +++ b/test/scripts/0000-Basic/0559 @@ -10,7 +10,6 @@ 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 0f7ff3e4a..9355c46fc 100644 --- a/test/scripts/0000-Basic/0562 +++ b/test/scripts/0000-Basic/0562 @@ -10,7 +10,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:\r\nrcpt to:\r\ndata ??? 250 @@ -57,7 +56,6 @@ 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 55be93a3c..68fb607ec 100644 --- a/test/scripts/0000-Basic/0564 +++ b/test/scripts/0000-Basic/0564 @@ -10,7 +10,6 @@ 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 3170647e2..d0a71a6cd 100644 --- a/test/scripts/1000-Basic-ipv6/1001 +++ b/test/scripts/1000-Basic-ipv6/1001 @@ -12,7 +12,6 @@ ehlo [HOSTIPV6] ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:<> ??? 250 @@ -30,7 +29,6 @@ ehlo [IPV6:HOSTIPV6] ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from:<> ??? 250 @@ -48,7 +46,6 @@ 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 f8a7dccad..06e1a8257 100644 --- a/test/scripts/2000-GnuTLS/2002 +++ b/test/scripts/2000-GnuTLS/2002 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -34,7 +33,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -47,7 +45,6 @@ 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 1635c6344..d4bcedd67 100644 --- a/test/scripts/2000-GnuTLS/2003 +++ b/test/scripts/2000-GnuTLS/2003 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -29,7 +28,6 @@ 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 6967d3b8f..a310bb6ec 100644 --- a/test/scripts/2000-GnuTLS/2004 +++ b/test/scripts/2000-GnuTLS/2004 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 250 @@ -27,7 +26,6 @@ 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 f837cc44f..a2164b327 100644 --- a/test/scripts/2000-GnuTLS/2005 +++ b/test/scripts/2000-GnuTLS/2005 @@ -14,7 +14,6 @@ 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 a30146c5a..1da0f7ddc 100644 --- a/test/scripts/2000-GnuTLS/2006 +++ b/test/scripts/2000-GnuTLS/2006 @@ -10,7 +10,6 @@ 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 88a269a7f..c5a01494a 100644 --- a/test/scripts/2000-GnuTLS/2014 +++ b/test/scripts/2000-GnuTLS/2014 @@ -12,7 +12,6 @@ ehlo rhu1.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -26,7 +25,6 @@ ehlo rhu2.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -48,7 +46,6 @@ ehlo rhu3.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -68,7 +65,6 @@ ehlo rhu4.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -88,7 +84,6 @@ ehlo rhu5.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -102,7 +97,6 @@ ehlo rhu6.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -126,7 +120,6 @@ ehlo rhu7.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -140,7 +133,6 @@ 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 73fd837cb..140af797f 100644 --- a/test/scripts/2000-GnuTLS/2015 +++ b/test/scripts/2000-GnuTLS/2015 @@ -10,7 +10,6 @@ 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 dbb210570..ac6049fd8 100644 --- a/test/scripts/2000-GnuTLS/2018 +++ b/test/scripts/2000-GnuTLS/2018 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -34,7 +33,6 @@ 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 ed6a75e6a..d59f42ea2 100644 --- a/test/scripts/2000-GnuTLS/2019 +++ b/test/scripts/2000-GnuTLS/2019 @@ -9,7 +9,6 @@ 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 13f9d48d9..b90361982 100644 --- a/test/scripts/2000-GnuTLS/2022 +++ b/test/scripts/2000-GnuTLS/2022 @@ -10,7 +10,6 @@ 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 b588e60ef..7e16b7b05 100644 --- a/test/scripts/2000-GnuTLS/2024 +++ b/test/scripts/2000-GnuTLS/2024 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -26,7 +25,6 @@ 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 00eef36e1..e5bb97b72 100644 --- a/test/scripts/2000-GnuTLS/2028 +++ b/test/scripts/2000-GnuTLS/2028 @@ -12,7 +12,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -26,7 +25,6 @@ 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 40ac3047e..ab4f9491e 100644 --- a/test/scripts/2000-GnuTLS/2029 +++ b/test/scripts/2000-GnuTLS/2029 @@ -14,7 +14,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102 index c9a0a8d58..7f9279acd 100644 --- a/test/scripts/2100-OpenSSL/2102 +++ b/test/scripts/2100-OpenSSL/2102 @@ -9,7 +9,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -33,7 +32,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -46,7 +44,6 @@ 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 f188b23f6..1018c4eb4 100644 --- a/test/scripts/2100-OpenSSL/2103 +++ b/test/scripts/2100-OpenSSL/2103 @@ -9,7 +9,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -28,7 +27,6 @@ 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 45a0194ba..55e54ddeb 100644 --- a/test/scripts/2100-OpenSSL/2104 +++ b/test/scripts/2100-OpenSSL/2104 @@ -9,7 +9,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 mail from: ??? 250 @@ -26,7 +25,6 @@ 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 c61dae33a..130fa48d9 100644 --- a/test/scripts/2100-OpenSSL/2105 +++ b/test/scripts/2100-OpenSSL/2105 @@ -13,7 +13,6 @@ 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 67982b0db..3e36603a9 100644 --- a/test/scripts/2100-OpenSSL/2106 +++ b/test/scripts/2100-OpenSSL/2106 @@ -9,7 +9,6 @@ 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 f8cfd68d4..9ba0bf925 100644 --- a/test/scripts/2100-OpenSSL/2114 +++ b/test/scripts/2100-OpenSSL/2114 @@ -10,7 +10,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -24,7 +23,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -46,7 +44,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -66,7 +63,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -86,7 +82,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -100,7 +95,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -124,7 +118,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -138,7 +131,6 @@ 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 7cb9e8864..9ecefdbac 100644 --- a/test/scripts/2100-OpenSSL/2115 +++ b/test/scripts/2100-OpenSSL/2115 @@ -9,7 +9,6 @@ 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 3be95b703..281060ca8 100644 --- a/test/scripts/2100-OpenSSL/2118 +++ b/test/scripts/2100-OpenSSL/2118 @@ -9,7 +9,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -33,7 +32,6 @@ 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 37dc31257..1ad9befd7 100644 --- a/test/scripts/2100-OpenSSL/2119 +++ b/test/scripts/2100-OpenSSL/2119 @@ -8,7 +8,6 @@ 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 4d1233763..b93013962 100644 --- a/test/scripts/2100-OpenSSL/2122 +++ b/test/scripts/2100-OpenSSL/2122 @@ -9,7 +9,6 @@ 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 c065181f2..eb999d6bf 100644 --- a/test/scripts/2100-OpenSSL/2124 +++ b/test/scripts/2100-OpenSSL/2124 @@ -9,7 +9,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -25,7 +24,6 @@ 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 8e0e204ba..b9d781a28 100644 --- a/test/scripts/2100-OpenSSL/2128 +++ b/test/scripts/2100-OpenSSL/2128 @@ -11,7 +11,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -25,7 +24,6 @@ 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 3861f3e8c..9ee9eb13f 100644 --- a/test/scripts/2100-OpenSSL/2150 +++ b/test/scripts/2100-OpenSSL/2150 @@ -12,7 +12,6 @@ ehlo abcd ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/3400-plaintext/3415 b/test/scripts/3400-plaintext/3415 index 590a55c96..d5bcc33be 100644 --- a/test/scripts/3400-plaintext/3415 +++ b/test/scripts/3400-plaintext/3415 @@ -11,7 +11,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 auth plain AHVzZXJuYW1lAG15c2VjcmV0 ??? 235 @@ -47,7 +46,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 auth plain AHVzZXJuYW1lAG15c2VjcmV0 ??? 235 @@ -75,7 +73,6 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 auth plain AHVzZXJuYW1lAG15c2VjcmV0 ??? 235 @@ -103,7 +100,6 @@ 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 87ccbbf80..0494118ca 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3450 +++ b/test/scripts/3450-plaintext-GnuTLS/3450 @@ -11,7 +11,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 @@ -27,7 +26,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 503 @@ -39,7 +37,6 @@ 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 27c56b7fc..a88f49f3d 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3453 +++ b/test/scripts/3450-plaintext-GnuTLS/3453 @@ -11,7 +11,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -34,7 +33,6 @@ 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 6ffa4cd00..7ef007707 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3454 +++ b/test/scripts/3450-plaintext-GnuTLS/3454 @@ -11,7 +11,6 @@ ehlo foobar ??? 250-PIPELINING ??? 250-AUTH ??? 250-STARTTLS -??? 250-PRDR ??? 250 HELP starttls ??? 220 TLS @@ -27,7 +26,6 @@ ehlo foobar ??? 250-PIPELINING ??? 250-AUTH ??? 250-STARTTLS -??? 250-PRDR ??? 250 HELP starttls ??? 220 TLS @@ -37,7 +35,6 @@ 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 c06ddc83b..98c7219cd 100644 --- a/test/scripts/3460-plaintext-OpenSSL/3460 +++ b/test/scripts/3460-plaintext-OpenSSL/3460 @@ -10,7 +10,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 @@ -26,7 +25,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 503 @@ -38,7 +36,6 @@ 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 8e4843e4f..dd83449a9 100644 --- a/test/scripts/3460-plaintext-OpenSSL/3463 +++ b/test/scripts/3460-plaintext-OpenSSL/3463 @@ -10,7 +10,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -33,7 +32,6 @@ 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 6ec446234..997ae3056 100644 --- a/test/scripts/3460-plaintext-OpenSSL/3464 +++ b/test/scripts/3460-plaintext-OpenSSL/3464 @@ -10,7 +10,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -26,7 +25,6 @@ ehlo foobar ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 starttls ??? 220 @@ -36,7 +34,6 @@ 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 78b7bd3a3..9f4f38941 100644 --- a/test/scripts/3600-SPA/3600 +++ b/test/scripts/3600-SPA/3600 @@ -17,7 +17,6 @@ EHLO xxxx ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 AUTH NTLM ??? 334 @@ -34,7 +33,6 @@ EHLO xxxx ??? 250- ??? 250- ??? 250- -??? 250- ??? 250 AUTH NTLM ??? 334 diff --git a/test/stderr/0303 b/test/stderr/0303 index 54ccb550e..bd6f78c4b 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -77,7 +77,6 @@ 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 @@ -147,7 +146,6 @@ 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 b0a09ab9e..c4f9a93ac 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -39,7 +39,6 @@ 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 883f0ee81..448754ed5 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -24,7 +24,6 @@ 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 67697bf81..64d0bdc11 100644 --- a/test/stderr/2008 +++ b/test/stderr/2008 @@ -9,7 +9,6 @@ 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 @@ -18,7 +17,6 @@ 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: @@ -42,7 +40,6 @@ 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 @@ -51,7 +48,6 @@ 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: @@ -76,7 +72,6 @@ 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 @@ -85,7 +80,6 @@ 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/2013 b/test/stderr/2013 index e9189c61b..172d98a26 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -11,7 +11,6 @@ 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 @@ -20,7 +19,6 @@ 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: @@ -35,7 +33,6 @@ 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" C="250 OK id=10HmaZ-0005vi-00" @@ -52,7 +49,6 @@ 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/2108 b/test/stderr/2108 index c03becfac..743f7ba71 100644 --- a/test/stderr/2108 +++ b/test/stderr/2108 @@ -9,7 +9,6 @@ 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 @@ -18,7 +17,6 @@ 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: @@ -42,7 +40,6 @@ 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 @@ -51,7 +48,6 @@ 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: @@ -76,7 +72,6 @@ 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 @@ -85,7 +80,6 @@ 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 72018c05f..10c7e8022 100644 --- a/test/stderr/2113 +++ b/test/stderr/2113 @@ -11,7 +11,6 @@ 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 @@ -20,7 +19,6 @@ 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: @@ -35,7 +33,6 @@ 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" @@ -52,7 +49,6 @@ 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 d3bad82a7..0a24b05fb 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -406,7 +406,6 @@ 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 4a0690795..f8b31a750 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -49,7 +49,6 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS - 250-PRDR 250 HELP expanding: $address_data result: userx @@ -86,7 +85,6 @@ expanding: ${if eq {$address_data}{userz}{*}{:}} 250-SIZE 52428800 250-8BITMIME 250-PIPELINING - 250-PRDR 250 HELP SMTP>> MAIL FROM: SMTP<< 250 OK @@ -205,7 +203,6 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS - 250-PRDR 250 HELP expanding: $address_data result: usery @@ -338,7 +335,6 @@ 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 afef6c783..e711184f5 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -49,7 +49,6 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS - 250-PRDR 250 HELP expanding: $address_data result: userx @@ -86,7 +85,6 @@ expanding: ${if eq {$address_data}{userz}{*}{:}} 250-SIZE 52428800 250-8BITMIME 250-PIPELINING - 250-PRDR 250 HELP SMTP>> MAIL FROM: SMTP<< 250 OK @@ -205,7 +203,6 @@ expanding: $primary_hostname 250-8BITMIME 250-PIPELINING 250-STARTTLS - 250-PRDR 250 HELP expanding: $address_data result: usery @@ -338,7 +335,6 @@ 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 4dfa0faf4..5559e27d2 100644 --- a/test/stdout/0019 +++ b/test/stdout/0019 @@ -22,7 +22,6 @@ 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 d4edc622f..7b6c71023 100644 --- a/test/stdout/0028 +++ b/test/stdout/0028 @@ -9,7 +9,6 @@ 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 8c5925615..db83cd005 100644 --- a/test/stdout/0034 +++ b/test/stdout/0034 @@ -9,25 +9,21 @@ 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 @@ -58,7 +54,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -68,7 +63,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -78,7 +72,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -88,25 +81,21 @@ 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 986f5b5af..6855c1d31 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -10,8 +10,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -92,8 +90,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -125,8 +121,6 @@ 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 c3ba065fd..fec80a9ff 100644 --- a/test/stdout/0038 +++ b/test/stdout/0038 @@ -8,7 +8,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -25,7 +24,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -42,7 +40,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -59,7 +56,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -76,7 +72,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -95,7 +90,6 @@ 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 40eb415ac..c25b99168 100644 --- a/test/stdout/0043 +++ b/test/stdout/0043 @@ -8,7 +8,6 @@ 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 50ccc44c4..1840508b6 100644 --- a/test/stdout/0044 +++ b/test/stdout/0044 @@ -8,7 +8,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -29,7 +28,6 @@ 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 016adf8a5..18339e98a 100644 --- a/test/stdout/0070 +++ b/test/stdout/0070 @@ -99,7 +99,6 @@ 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 7a8e668a7..431357612 100644 --- a/test/stdout/0079 +++ b/test/stdout/0079 @@ -8,7 +8,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -24,7 +23,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -36,7 +34,6 @@ 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 a21a334e6..65625dd3e 100644 --- a/test/stdout/0080 +++ b/test/stdout/0080 @@ -8,7 +8,6 @@ 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 af39feda5..88b1b79e0 100644 --- a/test/stdout/0138 +++ b/test/stdout/0138 @@ -8,7 +8,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -29,7 +28,6 @@ 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 94d57e56f..fd6fc0bed 100644 --- a/test/stdout/0159 +++ b/test/stdout/0159 @@ -10,8 +10,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -38,8 +36,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -66,8 +62,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from:<> @@ -94,8 +88,6 @@ 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 dd38d39de..e2c14c4ab 100644 --- a/test/stdout/0180 +++ b/test/stdout/0180 @@ -3,7 +3,6 @@ 250-SIZE 100 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 552 Message size exceeds maximum permitted 250 Reset OK @@ -23,7 +22,6 @@ 250-SIZE 500 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 221 myhost.test.ex closing connection @@ -36,7 +34,6 @@ 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 @@ -44,7 +41,6 @@ 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 229894e07..ae4da9034 100644 --- a/test/stdout/0181 +++ b/test/stdout/0181 @@ -3,7 +3,6 @@ 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 393b475b4..af7553042 100644 --- a/test/stdout/0243 +++ b/test/stdout/0243 @@ -8,7 +8,6 @@ 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 6b807da4e..abb6172b5 100644 --- a/test/stdout/0282 +++ b/test/stdout/0282 @@ -10,8 +10,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -43,8 +41,6 @@ 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 7908225f8..1fb1f8141 100644 --- a/test/stdout/0287 +++ b/test/stdout/0287 @@ -12,8 +12,6 @@ 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 efb7b7e78..e01188818 100644 --- a/test/stdout/0300 +++ b/test/stdout/0300 @@ -17,8 +17,6 @@ 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 @@ -63,8 +61,6 @@ 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: @@ -93,8 +89,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> rset\r\nquit @@ -113,8 +107,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> rset\r\nquit @@ -133,8 +125,6 @@ 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 68a2501d4..71f6af970 100644 --- a/test/stdout/0301 +++ b/test/stdout/0301 @@ -10,8 +10,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP ??? 250 @@ -32,8 +30,6 @@ 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 @@ -72,8 +68,6 @@ 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 639fa7954..7b9a23b91 100644 --- a/test/stdout/0303 +++ b/test/stdout/0303 @@ -16,7 +16,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 221 myhost.test.ex closing connection @@ -37,7 +36,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -57,7 +55,6 @@ 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 0e9fb8b87..313432631 100644 --- a/test/stdout/0371 +++ b/test/stdout/0371 @@ -8,7 +8,6 @@ 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 9843faa6f..e2c165c0b 100644 --- a/test/stdout/0384 +++ b/test/stdout/0384 @@ -8,7 +8,6 @@ 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 ddb13bd66..0a42e0ea2 100644 --- a/test/stdout/0448 +++ b/test/stdout/0448 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -15,7 +14,6 @@ 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 2d6bea6be..92efc311a 100644 --- a/test/stdout/0451 +++ b/test/stdout/0451 @@ -3,7 +3,6 @@ 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 03b2a5ebc..47d52c1ac 100644 --- a/test/stdout/0458 +++ b/test/stdout/0458 @@ -10,8 +10,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -66,8 +64,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -122,8 +118,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-8BITMIME ??? 250- <<< 250-PIPELINING -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -190,8 +184,6 @@ 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 f39b5db61..1a3462b85 100644 --- a/test/stdout/0460 +++ b/test/stdout/0460 @@ -10,8 +10,6 @@ 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 8d7f0c5f8..9fff9a601 100644 --- a/test/stdout/0473 +++ b/test/stdout/0473 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -27,7 +26,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -37,7 +35,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -47,7 +44,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550-Callout verification failed: @@ -58,7 +54,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550 Previous (cached) callout verification failure @@ -68,7 +63,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550-Verification failed for @@ -82,7 +76,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550-Verification failed for @@ -94,7 +87,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -113,7 +105,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 451 Could not complete recipient verify callout @@ -123,7 +114,6 @@ 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 8f0f012e7..2fea10b6c 100644 --- a/test/stdout/0485 +++ b/test/stdout/0485 @@ -3,7 +3,6 @@ 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 4b0a5948a..e76858efb 100644 --- a/test/stdout/0486 +++ b/test/stdout/0486 @@ -3,7 +3,6 @@ 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 bf6d1f4b6..c8452793b 100644 --- a/test/stdout/0487 +++ b/test/stdout/0487 @@ -3,7 +3,6 @@ 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 24db5382d..5c48151b0 100644 --- a/test/stdout/0495 +++ b/test/stdout/0495 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -16,7 +15,6 @@ 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 560c842a2..d0fc6ede1 100644 --- a/test/stdout/0513 +++ b/test/stdout/0513 @@ -8,7 +8,6 @@ 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 4143fe4c8..fad288a29 100644 --- a/test/stdout/0524 +++ b/test/stdout/0524 @@ -8,7 +8,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Reset OK @@ -16,7 +15,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 550 CSA status is fail 221 myhost.test.ex closing connection @@ -30,7 +28,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 550 CSA status is fail 250 Reset OK @@ -38,7 +35,6 @@ 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 8bc415dbe..ff1beab89 100644 --- a/test/stdout/0536 +++ b/test/stdout/0536 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550 No code @@ -34,7 +33,6 @@ 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 62e60252f..afbab0d29 100644 --- a/test/stdout/0537 +++ b/test/stdout/0537 @@ -15,7 +15,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Reset OK @@ -26,7 +25,6 @@ 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 a306faaed..d267fea04 100644 --- a/test/stdout/0544 +++ b/test/stdout/0544 @@ -3,7 +3,6 @@ 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 cc57ab79a..c1fc53b5e 100644 --- a/test/stdout/0546 +++ b/test/stdout/0546 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 299-MAIL is 299 OK @@ -16,7 +15,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 299-MAIL is 299 OK @@ -27,6 +25,5 @@ 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 b7f749c37..7e931992c 100644 --- a/test/stdout/0547 +++ b/test/stdout/0547 @@ -13,16 +13,14 @@ 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 @@ -36,16 +34,14 @@ 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 382392c45..7609d5146 100644 --- a/test/stdout/0549 +++ b/test/stdout/0549 @@ -8,8 +8,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> quit @@ -28,8 +26,6 @@ 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 1be7b1da7..73046aaa2 100644 --- a/test/stdout/0556 +++ b/test/stdout/0556 @@ -10,8 +10,6 @@ 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 @@ -36,8 +34,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-SIZE 52428800 ??? 250- <<< 250-8BITMIME -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -56,8 +52,6 @@ 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 adfae0a32..b80b14933 100644 --- a/test/stdout/0558 +++ b/test/stdout/0558 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550-Default deny message @@ -22,7 +21,6 @@ 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 bdc2ce330..b5cc62c49 100644 --- a/test/stdout/0559 +++ b/test/stdout/0559 @@ -10,8 +10,6 @@ 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 8d05c516c..693fddace 100644 --- a/test/stdout/0562 +++ b/test/stdout/0562 @@ -10,8 +10,6 @@ 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 @@ -80,8 +78,6 @@ 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 d1e6681cb..6f4f06bdb 100644 --- a/test/stdout/0564 +++ b/test/stdout/0564 @@ -10,8 +10,6 @@ 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 a6982e1b6..d3465d49e 100644 --- a/test/stdout/0566 +++ b/test/stdout/0566 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -13,7 +12,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -23,7 +21,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -33,7 +30,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -43,7 +39,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -53,7 +48,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -63,7 +57,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -73,7 +66,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -83,7 +75,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550 SIZE value too big @@ -93,7 +84,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 550 SIZE value too big @@ -103,7 +93,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -115,7 +104,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -127,7 +115,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -139,7 +126,6 @@ 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 bf987a746..7ba8eb07c 100644 --- a/test/stdout/1001 +++ b/test/stdout/1001 @@ -10,8 +10,6 @@ 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:<> @@ -38,8 +36,6 @@ 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:<> @@ -66,8 +62,6 @@ 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 27a573fb2..7b2a47fca 100644 --- a/test/stdout/2002 +++ b/test/stdout/2002 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -52,8 +50,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -78,8 +74,6 @@ 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 ca862195d..3176f19e6 100644 --- a/test/stdout/2003 +++ b/test/stdout/2003 @@ -12,8 +12,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -45,8 +43,6 @@ 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 d6222afe9..ac5245cba 100644 --- a/test/stdout/2004 +++ b/test/stdout/2004 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -40,8 +38,6 @@ 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 f8eca36c2..7a0430c10 100644 --- a/test/stdout/2005 +++ b/test/stdout/2005 @@ -18,8 +18,6 @@ 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 1c690c09d..ba53967e0 100644 --- a/test/stdout/2006 +++ b/test/stdout/2006 @@ -12,8 +12,6 @@ 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 685fd2cf0..56c959f20 100644 --- a/test/stdout/2014 +++ b/test/stdout/2014 @@ -12,8 +12,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -36,8 +34,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -74,8 +70,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -109,8 +103,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -144,8 +136,6 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -170,8 +160,6 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -207,8 +195,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -233,8 +219,6 @@ 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 0c2d77305..fd6174058 100644 --- a/test/stdout/2015 +++ b/test/stdout/2015 @@ -12,8 +12,6 @@ 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 7997f084c..c7a0df4c4 100644 --- a/test/stdout/2018 +++ b/test/stdout/2018 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -52,8 +50,6 @@ 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 6a7361011..b885461ed 100644 --- a/test/stdout/2019 +++ b/test/stdout/2019 @@ -12,8 +12,6 @@ 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 752d8c747..c6124c698 100644 --- a/test/stdout/2022 +++ b/test/stdout/2022 @@ -12,8 +12,6 @@ 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 cf2cc6af4..5022d27b3 100644 --- a/test/stdout/2023 +++ b/test/stdout/2023 @@ -4,7 +4,6 @@ 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 de585a792..2e30f7dd6 100644 --- a/test/stdout/2024 +++ b/test/stdout/2024 @@ -14,8 +14,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -40,8 +38,6 @@ 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 551c884f4..1ccd96b88 100644 --- a/test/stdout/2028 +++ b/test/stdout/2028 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -39,8 +37,6 @@ 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 691ddcba9..28be7c421 100644 --- a/test/stdout/2029 +++ b/test/stdout/2029 @@ -12,8 +12,6 @@ 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 a6132d974..d3c18a8bf 100644 --- a/test/stdout/2102 +++ b/test/stdout/2102 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -68,8 +66,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -110,8 +106,6 @@ 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 dc7b135e8..1c2f41881 100644 --- a/test/stdout/2103 +++ b/test/stdout/2103 @@ -12,8 +12,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -61,8 +59,6 @@ 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 d6222afe9..ac5245cba 100644 --- a/test/stdout/2104 +++ b/test/stdout/2104 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> mail from: @@ -40,8 +38,6 @@ 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 31a9836e8..a9eb350be 100644 --- a/test/stdout/2105 +++ b/test/stdout/2105 @@ -18,8 +18,6 @@ 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 597031fce..cae6e21c8 100644 --- a/test/stdout/2106 +++ b/test/stdout/2106 @@ -12,8 +12,6 @@ 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 35ca36e85..35a696915 100644 --- a/test/stdout/2114 +++ b/test/stdout/2114 @@ -12,8 +12,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -52,8 +50,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -108,8 +104,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -162,8 +156,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -216,8 +208,6 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -259,8 +249,6 @@ Key file = aux-fixed/cert1 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -315,8 +303,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -358,8 +344,6 @@ 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 0c2d77305..fd6174058 100644 --- a/test/stdout/2115 +++ b/test/stdout/2115 @@ -12,8 +12,6 @@ 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 fd146d8f6..1709dee8a 100644 --- a/test/stdout/2118 +++ b/test/stdout/2118 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -68,8 +66,6 @@ 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 30e93df1f..0bcff273b 100644 --- a/test/stdout/2119 +++ b/test/stdout/2119 @@ -28,8 +28,6 @@ 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 17c219624..4bb927032 100644 --- a/test/stdout/2122 +++ b/test/stdout/2122 @@ -12,8 +12,6 @@ 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 cf2cc6af4..5022d27b3 100644 --- a/test/stdout/2123 +++ b/test/stdout/2123 @@ -4,7 +4,6 @@ 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 131d3a7c6..d2d83d5b6 100644 --- a/test/stdout/2124 +++ b/test/stdout/2124 @@ -14,8 +14,6 @@ Key file = aux-fixed/cert2 <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -57,8 +55,6 @@ 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 0b45037ff..795f469d1 100644 --- a/test/stdout/2128 +++ b/test/stdout/2128 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -71,8 +69,6 @@ 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 24bfc22dc..2f5596499 100644 --- a/test/stdout/2150 +++ b/test/stdout/2150 @@ -12,8 +12,6 @@ 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 74e02f4b2..4ee74c877 100644 --- a/test/stdout/3000 +++ b/test/stdout/3000 @@ -31,7 +31,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -46,7 +45,6 @@ 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 f788c8ee8..2254a7ea3 100644 --- a/test/stdout/3208 +++ b/test/stdout/3208 @@ -8,7 +8,6 @@ 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 94fb810a1..67add4d54 100644 --- a/test/stdout/3400 +++ b/test/stdout/3400 @@ -23,7 +23,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 252 authentication required 550 authentication required @@ -57,7 +56,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 250 OK 550 authentication required @@ -74,7 +72,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 250 OK 250 Accepted @@ -108,7 +105,6 @@ 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 @@ -120,7 +116,6 @@ 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 @@ -132,7 +127,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 535 Incorrect authentication data 500 unrecognized command @@ -145,7 +139,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 334 VXNlciBOYW1l 334 UGFzc3dvcmQ= @@ -163,7 +156,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 334 VXNlciBOYW1l 235 Authentication succeeded @@ -176,7 +168,6 @@ 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 @@ -188,7 +179,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 334 UGFzc3dvcmQ= 235 Authentication succeeded @@ -201,7 +191,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 334 VXNlciBOYW1l 334 UGFzc3dvcmQ= @@ -219,7 +208,6 @@ 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 @@ -230,7 +218,6 @@ 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 @@ -242,7 +229,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 334 235 Authentication succeeded @@ -255,7 +241,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 334 bXlob3N0LnRlc3QuZXg= 235 Authentication succeeded @@ -268,7 +253,6 @@ 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 @@ -280,7 +264,6 @@ 250-ETRN 250-EXPN 250-PIPELINING -250-PRDR 250 HELP 503 AUTH command used when not advertised 500 unrecognized command @@ -293,7 +276,6 @@ 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 @@ -325,7 +307,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 250 OK 250 Accepted @@ -350,7 +331,6 @@ 250-EXPN 250-PIPELINING 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN -250-PRDR 250 HELP 334 VXNlciBOYW1l 334 UGFzc3dvcmQ= @@ -364,7 +344,6 @@ 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 @@ -375,7 +354,6 @@ 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 50d520e7b..444d46c06 100644 --- a/test/stdout/3402 +++ b/test/stdout/3402 @@ -4,7 +4,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -15,7 +14,6 @@ 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 bb641d314..299e3ca67 100644 --- a/test/stdout/3403 +++ b/test/stdout/3403 @@ -4,7 +4,6 @@ 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 99defe814..81d58e350 100644 --- a/test/stdout/3406 +++ b/test/stdout/3406 @@ -4,7 +4,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH FIRST -250-PRDR 250 HELP 235 Authentication succeeded 221 myhost.test.ex closing connection @@ -14,7 +13,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH SECOND -250-PRDR 250 HELP 504 first authentication mechanism not supported 221 myhost.test.ex closing connection @@ -24,7 +22,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH FIRST -250-PRDR 250 HELP 504 second authentication mechanism not supported 221 myhost.test.ex closing connection @@ -34,7 +31,6 @@ 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 1846c39b4..b5fffd08e 100644 --- a/test/stdout/3408 +++ b/test/stdout/3408 @@ -9,7 +9,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 250 OK 250 Accepted @@ -31,7 +30,6 @@ 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 ce9f69759..ae2912f20 100644 --- a/test/stdout/3409 +++ b/test/stdout/3409 @@ -5,7 +5,6 @@ 250-ETRN 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 501 invalid character in authentication mechanism name 235 Authentication succeeded @@ -19,7 +18,6 @@ 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 6bf73b93c..5c356db81 100644 --- a/test/stdout/3410 +++ b/test/stdout/3410 @@ -12,7 +12,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN LOGIN -250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -32,7 +31,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN LOGIN -250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -49,7 +47,6 @@ 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 01fc31727..14230657d 100644 --- a/test/stdout/3411 +++ b/test/stdout/3411 @@ -4,7 +4,6 @@ 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 d9915d07f..5370c5e40 100644 --- a/test/stdout/3413 +++ b/test/stdout/3413 @@ -4,7 +4,6 @@ 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 93927a120..a96858c19 100644 --- a/test/stdout/3414 +++ b/test/stdout/3414 @@ -4,7 +4,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 250 OK 221 myhost.test.ex closing connection @@ -14,7 +13,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 250 OK 221 myhost.test.ex closing connection @@ -24,7 +22,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 250 OK 221 myhost.test.ex closing connection @@ -34,7 +31,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -45,7 +41,6 @@ 250-8BITMIME 250-PIPELINING 250-AUTH PLAIN -250-PRDR 250 HELP 235 Authentication succeeded 250 OK @@ -56,7 +51,6 @@ 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 899f2910f..f675c6c74 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -12,8 +12,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJuYW1lAG15c2VjcmV0 @@ -61,8 +59,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJuYW1lAG15c2VjcmV0 @@ -98,8 +94,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJuYW1lAG15c2VjcmV0 @@ -135,8 +129,6 @@ 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 e94f2ead8..1bd2e21d2 100644 --- a/test/stdout/3450 +++ b/test/stdout/3450 @@ -14,8 +14,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -41,8 +39,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -79,8 +75,6 @@ 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 dc8155dab..098973d42 100644 --- a/test/stdout/3453 +++ b/test/stdout/3453 @@ -14,8 +14,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -49,8 +47,6 @@ 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 574f58fac..ae2eab337 100644 --- a/test/stdout/3454 +++ b/test/stdout/3454 @@ -14,8 +14,6 @@ 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 @@ -58,8 +56,6 @@ 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 @@ -93,8 +89,6 @@ 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 4b6179f78..92c47970f 100644 --- a/test/stdout/3460 +++ b/test/stdout/3460 @@ -14,8 +14,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -41,8 +39,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -80,8 +76,6 @@ 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 cb6132175..68b1b55c0 100644 --- a/test/stdout/3463 +++ b/test/stdout/3463 @@ -14,8 +14,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -65,8 +63,6 @@ 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 f5798dcaf..46f1c3729 100644 --- a/test/stdout/3464 +++ b/test/stdout/3464 @@ -14,8 +14,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -59,8 +57,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-AUTH PLAIN ??? 250- <<< 250-STARTTLS -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> starttls @@ -95,8 +91,6 @@ 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 5e2eb83bf..634ac1ecd 100644 --- a/test/stdout/3500 +++ b/test/stdout/3500 @@ -6,7 +6,6 @@ 250-EXPN 250-PIPELINING 250-AUTH CRAM-MD5 -250-PRDR 250 HELP 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ 235 Authentication succeeded @@ -23,7 +22,6 @@ 250-EXPN 250-PIPELINING 250-AUTH CRAM-MD5 -250-PRDR 250 HELP 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ 235 Authentication succeeded @@ -40,7 +38,6 @@ 250-ETRN 250-EXPN 250-PIPELINING -250-PRDR 250 HELP 221 myhost.test.ex closing connection @@ -56,7 +53,6 @@ 250-EXPN 250-PIPELINING 250-AUTH CRAM-MD5 -250-PRDR 250 HELP 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ 235 Authentication succeeded @@ -81,7 +77,6 @@ 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 db6435978..7d3707945 100644 --- a/test/stdout/3600 +++ b/test/stdout/3600 @@ -13,8 +13,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-PIPELINING ??? 250- <<< 250-AUTH NTLMX NTLM -??? 250- -<<< 250-PRDR ??? 250 <<< 250 HELP >>> AUTH NTLM @@ -41,8 +39,6 @@ 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 8ce7a2ef8..532eb41d7 100644 --- a/test/stdout/5204 +++ b/test/stdout/5204 @@ -23,7 +23,6 @@ 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 d8268d8cb..74c2d2358 100644 --- a/test/stdout/5400 +++ b/test/stdout/5400 @@ -3,7 +3,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -15,7 +14,6 @@ 250-SIZE 52428800 250-8BITMIME 250-PIPELINING -250-PRDR 250 HELP 250 OK 250 Accepted @@ -27,7 +25,6 @@ 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 72b6e3ed2..1ceb0bffb 100644 --- a/test/stdout/5401 +++ b/test/stdout/5401 @@ -3,7 +3,6 @@ 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 7b81b220c..edf01f8ba 100644 --- a/test/stdout/5410 +++ b/test/stdout/5410 @@ -4,7 +4,6 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS -250-PRDR 250 HELP 250 OK 250 Accepted @@ -17,7 +16,6 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS -250-PRDR 250 HELP 250 OK 250 Accepted @@ -30,7 +28,6 @@ 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 7b81b220c..edf01f8ba 100644 --- a/test/stdout/5420 +++ b/test/stdout/5420 @@ -4,7 +4,6 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS -250-PRDR 250 HELP 250 OK 250 Accepted @@ -17,7 +16,6 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS -250-PRDR 250 HELP 250 OK 250 Accepted @@ -30,7 +28,6 @@ 250-8BITMIME 250-PIPELINING 250-STARTTLS -250-PRDR 250 HELP 250 OK 250 Accepted -- 2.25.1