Default prdr_enabled to false, so that most testsuite cases work unchanged.

This is probably how we want it until PRDR goes non-EXPERIMENTAL.

diff --git a/src/src/globals.c b/src/src/globals.c
index 73bd330ba87d7b9f0ad46193df1e1130d4d8b68f..f4f1a7395f93ad52d854e3a3ff435cf977b90baf 100644 (file)
--- 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 03b6792d11cfe0be780145e7c88235396feef350..330c557d70a3f6619a405aea5a74aa5ca9537135 100644 (file)
--- 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 8ffa104612884ad76e636ed02709a79e6ddae593..147c8e7e250b1f3f5becb87b6e2694992f2c302e 100644 (file)
--- 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:<notsubmit@y>
 ??? 250
@@ -69,7 +68,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<a@y>
 ??? 250
@@ -95,7 +93,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<a@y>
 ??? 250

diff --git a/test/scripts/0000-Basic/0159 b/test/scripts/0000-Basic/0159
index 252e85c9b81e20d98f655df604ef5ff020246242..b30ca90d666e9e43288a6ae1dcef4c8939f64ec2 100644 (file)
--- 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 8015586ac5e1fabf71f02ec8cf15bb287b6d014e..d19464e12278c44b5965afb5b182f551a86354fb 100644 (file)
--- 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:<userx@test.ex>
 ??? 250
@@ -31,7 +30,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/0000-Basic/0287 b/test/scripts/0000-Basic/0287
index 562325acd0be04d446d4c92ffe5390caff281045..9aa9f52e240e50fc36ac3097213bdfefd59b6006 100644 (file)
--- 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 69e5d1a4794e0e959a2992bc36aaeb48d28aa0fd..047dba410c15ec156d26661fd633e7b4ac2d5812 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
@@ -49,7 +48,6 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>
 ??? 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 .

diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 3fac3aef56de5d0ed6c81938e30f4aba57337319..08996c7efb223d92b6742d5a9bf82fc1a2b7d270 100644 (file)
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -10,7 +10,6 @@ ehlo abcd\r\nmail from:<userx@test.ex>
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 ??? 250
 quit
@@ -23,7 +22,6 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
@@ -48,7 +46,6 @@ ehlo en.force
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 .

diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458
index 6e55ba08f0401261574b7cf26dd8231ee7bed7b5..062dec50097c891569b68398b19057c76451c8a9 100644 (file)
--- 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:<userx@test.ex>
 ??? 250
@@ -45,7 +44,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<deny@test.ex>
 ??? 550
@@ -80,7 +78,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>
 ??? 250
@@ -123,7 +120,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 rcpt to:<userx@test.ex>
 ??? 503

diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460
index d36695dd4cdf5917ce8d9af880716d97a30fd251..b91be2084e65e46dd6ca0ee48583147a6e811e88 100644 (file)
--- 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:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547
index 9be2aa4ea5befe7d77ec7cd027c6b20e71d35345..2595eff482c85c01256368f54d18e444dc1aab61 100644 (file)
--- 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 5eda566130a60ece0c8bc1de984189307bcadff6..4126ae73fdc59bb586bf1c2954c033b04b3fb727 100644 (file)
--- 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 fead086d4091af45d68c700d16b4e507b692d764..2283c69b09113cb8c439f4861899c47cfd2f48e6 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 +++ 1
@@ -36,7 +35,6 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>
 +++ 1
@@ -49,7 +47,6 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559
index 8a68c708c84dc04fcb62228087c4a093d959e9b4..7ebc64d341de480d2a643b5ce61b8ea00d8c9234 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250

diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562
index 0f7ff3e4a438c28a2c83b356c5629203112cc8c6..9355c46fcc5d82324282aaa928c480dacb5d36e4 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
@@ -57,7 +56,6 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250

diff --git a/test/scripts/0000-Basic/0564 b/test/scripts/0000-Basic/0564
index 55be93a3c19a10704d01c29c7b3efae93cd9d23c..68fb607ec1b1e3652137873d0867c0d6a7046956 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250

diff --git a/test/scripts/1000-Basic-ipv6/1001 b/test/scripts/1000-Basic-ipv6/1001
index 3170647e24f84c7dee2686dbc40a0c399b6ef916..d0a71a6cd36c195c7ad365734a8747067598b1d3 100644 (file)
--- 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 f8a7dccad8182abff1c2f9dfe60708e2e88ecf02..06e1a82575ba7056766b22ebcd710a238d50c0ac 100644 (file)
--- 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 1635c634454fbe0a033982164cfb1d15163e6486..d4bcedd67e853dc0364be76de29345215f106cfb 100644 (file)
--- 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 6967d3b8f5b15a1ea2fd8e0a79b949efda368d32..a310bb6ec37c51afff1f5628fb580b4768e9834d 100644 (file)
--- 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:<userx@test.ex>
 ??? 250
@@ -27,7 +26,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/2000-GnuTLS/2005 b/test/scripts/2000-GnuTLS/2005
index f837cc44f8fb2c601bd5519fc135581b2bcc52d4..a2164b327955324628db4b3887d8806738442e62 100644 (file)
--- 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 a30146c5a53ac59af1674191b3baef29237ff202..1da0f7ddcc90426edd862227cf855858342c4161 100644 (file)
--- 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 88a269a7f4effd9e84b742b4402a5059d25459a7..c5a01494adad15ec17f8ef6efc2b34c726176cef 100644 (file)
--- 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 73fd837cb1746ea6e59b2f7a5495381ab276d338..140af797f6a1c6a64c85f66fc22b36b3fa8c26c0 100644 (file)
--- 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 dbb2105707e22de659c4d62d1475b0826d8afa19..ac6049fd85fda98efffd081fccdc8578ec27a692 100644 (file)
--- 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:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/2000-GnuTLS/2019 b/test/scripts/2000-GnuTLS/2019
index ed6a75e6a8def446a6e086d6767082ea8bb12d6f..d59f42ea2161655ed0ab677256a5d43f025bf995 100644 (file)
--- 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:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/2000-GnuTLS/2022 b/test/scripts/2000-GnuTLS/2022
index 13f9d48d930941a947f744aadf95473f0fd30c3b..b903619820e377d1d2ff7b8682562a4a9e9b6d30 100644 (file)
--- 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 b588e60efa35ec4f88edad109349952be15f161d..7e16b7b053693e75d0521bf4d439cc7492f1abb8 100644 (file)
--- 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 00eef36e1bfcfc095b5be58085782402ea2a964c..e5bb97b72bcff29b0dc7cbfdb6655ec8a004cf15 100644 (file)
--- 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 40ac3047e5f735035ad5c9f7d912888415b46340..ab4f9491ea0f43f381881ee3c475c6c2cbd4310f 100644 (file)
--- 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 c9a0a8d583a6fcca85e50e86fa0217a0927a3527..7f9279acd12160a53ef2b33fba3d31e277d887cd 100644 (file)
--- 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 f188b23f69f4ae813d3c59ee762c763493cda57d..1018c4eb41aa1f718eb34de3fca6cff8e4b1d6b9 100644 (file)
--- 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 45a0194ba46d600f440d0d6ab9dc7dc876122cff..55e54ddeb47a41130bbcdfeb85a2996fc66fdf65 100644 (file)
--- 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:<userx@test.ex>
 ??? 250
@@ -26,7 +25,6 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
-??? 250-
 ??? 250
 mail from:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/2100-OpenSSL/2105 b/test/scripts/2100-OpenSSL/2105
index c61dae33a8596263315cb56c9a99c8fecd6c7a9a..130fa48d9d54c2168c2cbe4d129cd8774d7fe90d 100644 (file)
--- 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 67982b0db9804e8f94e046d9ec25b8fa63114926..3e36603a9f98eb5e88677c7b4e8c23a668948ace 100644 (file)
--- 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 f8cfd68d449a8ed164414ca2b560a18382f91e52..9ba0bf925d746cf9275b4a1284b7c79ac644ada3 100644 (file)
--- 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 7cb9e886407a106574b5ebdaf2d32c82c1b2f6b3..9ecefdbac5678b52028709e45f4cce72251bb809 100644 (file)
--- 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 3be95b703ec3bcec289aba4644e8972a1c126368..281060ca82428b507c60586b0cca94cff0b95ff4 100644 (file)
--- 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:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/2100-OpenSSL/2119 b/test/scripts/2100-OpenSSL/2119
index 37dc312578499643c556023279eb1221b904ae96..1ad9befd765c2a2b09ff3c7a8625da17d91e6878 100644 (file)
--- 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:<userx@test.ex>
 ??? 250

diff --git a/test/scripts/2100-OpenSSL/2122 b/test/scripts/2100-OpenSSL/2122
index 4d123376392716758adcf8b65246ef8191988c0b..b930139628b52534f4ef5c793253d90ce5dcbfbf 100644 (file)
--- 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 c065181f2fd02cc3bb226970c7eccaec4bea3e61..eb999d6bf01690d63569bc059a36d7baf899440f 100644 (file)
--- 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 8e0e204ba0d4906f5c7e56f8ca4c2960d5628086..b9d781a28bdded5efea1159067ddc20935b6b66e 100644 (file)
--- 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 3861f3e8c654a44945e2210b17b41ef40af969de..9ee9eb13f4b76c1faf5148d9869b0bd48f8b3267 100644 (file)
--- 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 590a55c96385acf3b1b75821273d4f4e0c08790a..d5bcc33be5f52d1ea84cb87d539d75450ffc8232 100644 (file)
--- 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 87ccbbf80b0fcae269fb5656987673528aa11ea2..0494118ca94d4afff4d1c6654b397e56c8da6d72 100644 (file)
--- 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 27c56b7fc90792079d4a1bab21a7daaf5463b7c6..a88f49f3df6f834f531fa9c0ff57a30e38421cb6 100644 (file)
--- 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 6ffa4cd00a3f4e8b0889216357ba18e77ceb1274..7ef0077076d44cc54e1d83c639776047a7af5cee 100644 (file)
--- 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 c06ddc83b0fc486a01ba67b630deb2283cb79a97..98c7219cd44e814a9b5c3ee09060aac1c77aaee9 100644 (file)
--- 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 8e4843e4fa3daaeb4834317f7aaa7cd48cd5f2ee..dd83449a9a5ffe6f0abcc26261e676dd1f066db9 100644 (file)
--- 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 6ec446234155bbe34c3deb1aa1519f223db2a1eb..997ae3056c3fea7c4557c8edb2df77aaece232a5 100644 (file)
--- 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 78b7bd3a3283c82668e5b488029f35a636bde521..9f4f389411bef082439aaa74b61c81ef4043eea5 100644 (file)
--- 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 54ccb550e16f7507ca78293a29a92eaf6a76fd6b..bd6f78c4bdeafa8f579fb3e537e68cb66bfdef7f 100644 (file)
--- 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 b0a09ab9e86ceb81391bc6364c561f3fdab6d3df..c4f9a93ac3c24f2c780510e23c74031829ae7f12 100644 (file)
--- 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:<x@y>
 using ACL "mail"

diff --git a/test/stderr/0487 b/test/stderr/0487
index 883f0ee814925ba0164df9f5d109cd8eb80f9419..448754ed5cb36a7eacd704876ffe86657077feca 100644 (file)
--- 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:<x@y>
 SMTP>> 250 OK

diff --git a/test/stderr/2008 b/test/stderr/2008
index 67697bf81b00cb111d3ac54ee1386fe3a967fa22..64d0bdc119e2e51032ed83d64f86248514b27245 100644 (file)
--- 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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<CALLER@test.ex>
@@ -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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<CALLER@test.ex>
@@ -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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<abcd@test.ex>

diff --git a/test/stderr/2013 b/test/stderr/2013
index e9189c61bb703ed5eb5f4db12fc42c6e1da2eaa6..172d98a268fa5326c82697c2fff62ef186d7313d 100644 (file)
--- 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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>
@@ -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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>

diff --git a/test/stderr/2108 b/test/stderr/2108
index c03becfac1cdd8cd28d4ab4e1a30387e7b462464..743f7ba713da53467fcf58cd9cb9c97af09ee1d9 100644 (file)
--- 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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<CALLER@test.ex>
@@ -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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<CALLER@test.ex>
@@ -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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<abcd@test.ex>

diff --git a/test/stderr/2113 b/test/stderr/2113
index 72018c05fab56598598279fb8bb4ff36b1eb64ec..10c7e8022e56f85bf40de6b23782e309f27b2f96 100644 (file)
--- 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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>
@@ -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:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>

diff --git a/test/stderr/3400 b/test/stderr/3400
index d3bad82a7ab0d9274e0a6ee5da609d10fe970dbc..0a24b05fb9ad704c58d0b9d889665b1448f94d99 100644 (file)
--- 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 4a06907950644fe9432453bd5e3ce0609490cef3..f8b31a750745eb5a3c23cc4f60afb9d7b65cfa15 100644 (file)
--- 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:<CALLER@myhost.test.ex>
   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 afef6c7833254531658e4361b92dc77c68de4623..e711184f5c33bd20cb1658a63da30556d1aec180 100644 (file)
--- 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:<CALLER@myhost.test.ex>
   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 4dfa0faf475f60f295d10c2cc26f5fb1bf3c89f9..5559e27d20ab76ebd6efc77f9c345a96294cffa2 100644 (file)
--- a/test/stdout/0019
+++ b/test/stdout/0019
@@ -22,7 +22,6 @@
 250-8BITMIME\r
 250-ETRN\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 503 sender not yet given\r
 250 OK\r

diff --git a/test/stdout/0028 b/test/stdout/0028
index d4edc622f1706a1985e006ad82bb0a31bf5138c7..7b6c71023b188103058fcc72a555657e0cfb5c12 100644 (file)
--- a/test/stdout/0028
+++ b/test/stdout/0028
@@ -9,7 +9,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 SIZE value too big\r

diff --git a/test/stdout/0034 b/test/stdout/0034
index 8c59256150e2f3f6e251004252f3cb6c263ed1a1..db83cd005d5b1ed3837165adde9b4cad5848f97a 100644 (file)
--- a/test/stdout/0034
+++ b/test/stdout/0034
@@ -9,25 +9,21 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 554 Too many nonmail commands\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
@@ -58,7 +54,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -68,7 +63,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -78,7 +72,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -88,25 +81,21 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 554 Too many nonmail commands\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

diff --git a/test/stdout/0035 b/test/stdout/0035
index 986f5b5afa5106f13c17708063de2adbc14f7344..6855c1d3189209b077706b188b9788db5d4de233 100644 (file)
--- 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:<notsubmit@y>
@@ -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:<a@y>
@@ -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:<a@y>

diff --git a/test/stdout/0038 b/test/stdout/0038
index c3ba065fd89c037e57dcf6e71e7ea9be7b703135..fec80a9ff6e7bd4201a0e365a736b2423ab1c925 100644 (file)
--- a/test/stdout/0038
+++ b/test/stdout/0038
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -25,7 +24,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -42,7 +40,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -59,7 +56,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -76,7 +72,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -95,7 +90,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0043 b/test/stdout/0043
index 40eb415aca159b8573633bccc47e873a2e9fea68..c25b991684af213dc71e8922f48534757a53f4e6 100644 (file)
--- a/test/stdout/0043
+++ b/test/stdout/0043
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550-Verification failed for <junkjunk@exim.test.ex>\r

diff --git a/test/stdout/0044 b/test/stdout/0044
index 50ccc44c4bff94f6ee2fc1ac5828fa8111c03eb4..1840508b6074387e83a52a611a33945e79aeedc0 100644 (file)
--- a/test/stdout/0044
+++ b/test/stdout/0044
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -29,7 +28,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0070 b/test/stdout/0070
index 016adf8a5eaab34eae9a5c6fd7afc25ff9f341ac..18339e98a9c4e827cdb10ece501acbc15b4159df 100644 (file)
--- a/test/stdout/0070
+++ b/test/stdout/0070
@@ -99,7 +99,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 helo not verified\r

diff --git a/test/stdout/0079 b/test/stdout/0079
index 7a8e668a74faa3b56fe5090cb98ef89ff6a7d4f1..43135761246b6389d7930f7ee16221a67dca7915 100644 (file)
--- a/test/stdout/0079
+++ b/test/stdout/0079
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -24,7 +23,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -36,7 +34,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0080 b/test/stdout/0080
index a21a334e65cf9ea53213a4825f498a38edd8c9a7..65625dd3e23b35065557aaf5efd308abb747e0a6 100644 (file)
--- a/test/stdout/0080
+++ b/test/stdout/0080
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0138 b/test/stdout/0138
index af39feda52e0a33b1cac18c7a72baf95ff080559..88b1b79e080534f754e3cf412bea4fcc4eeeb0be 100644 (file)
--- a/test/stdout/0138
+++ b/test/stdout/0138
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -29,7 +28,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0159 b/test/stdout/0159
index 94d57e56fc6f1f9a41bd2ff01ebe9abb640c3a6b..fd6fc0bedaebbdb12f879d1db2d66d39f7a6f9b2 100644 (file)
--- 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 dd38d39deb756c1a2d027804132e16660d405bbd..e2c14c4abcd0126e65624cf9b827c6795c530484 100644 (file)
--- a/test/stdout/0180
+++ b/test/stdout/0180
@@ -3,7 +3,6 @@
 250-SIZE 100\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 552 Message size exceeds maximum permitted\r
 250 Reset OK\r
@@ -23,7 +22,6 @@
 250-SIZE 500\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 221 myhost.test.ex closing connection\r
 
@@ -36,7 +34,6 @@
 250-SIZE 600\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
@@ -44,7 +41,6 @@
 250-SIZE 100\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 552 Message size exceeds maximum permitted\r
 250 Reset OK\r

diff --git a/test/stdout/0181 b/test/stdout/0181
index 229894e07dcb5e6ab445f754fc1916b2b9131c9f..ae4da90346616ad4e970840dc704d6f312b88606 100644 (file)
--- a/test/stdout/0181
+++ b/test/stdout/0181
@@ -3,7 +3,6 @@
 250-SIZE 100\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0243 b/test/stdout/0243
index 393b475b4cb7f0aab57e0e47522ddd1e258fcdf3..af75530421f7417114f9892450652595929dac7a 100644 (file)
--- a/test/stdout/0243
+++ b/test/stdout/0243
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0282 b/test/stdout/0282
index 6b807da4e2499f8a895715287be4ae035d7a06ef..abb6172b58d13911c9339400413907afce12df47 100644 (file)
--- 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:<userx@test.ex>
@@ -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:<userx@test.ex>

diff --git a/test/stdout/0287 b/test/stdout/0287
index 7908225f85194adc108c6262aa51edb3570eed5d..1fb1f8141ef7c8c28049cd20d5660410715f1fe5 100644 (file)
--- 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 efb7b7e78f1b5df133eaf7a8b7d99d76e18f489a..e011888183d2240fca15baff1d656101c6a68265 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>
@@ -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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line

diff --git a/test/stdout/0301 b/test/stdout/0301
index 68a2501d407c578300071fa882704128c7ecb573..71f6af970e7cbe461dd8695a14104dc363d7d69e 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message

diff --git a/test/stdout/0303 b/test/stdout/0303
index 639fa795406b511978488bdeea2798c953bbf07a..7b9a23b912d4e1f358b19552c5d953876d66fb87 100644 (file)
--- a/test/stdout/0303
+++ b/test/stdout/0303
@@ -16,7 +16,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 221 myhost.test.ex closing connection\r
 
@@ -37,7 +36,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -57,7 +55,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0371 b/test/stdout/0371
index 0e9fb8b87b28766ba1d67e105750e2887486a66e..313432631f551e3e0163a9a656ed34b6cee42610 100644 (file)
--- a/test/stdout/0371
+++ b/test/stdout/0371
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0384 b/test/stdout/0384
index 9843faa6f1c07446e39dc1888168fb8df9dc71a4..e2c165c0bdd9906bd9ffcf6fb593ae22d7bef47c 100644 (file)
--- a/test/stdout/0384
+++ b/test/stdout/0384
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 EHLO argument does not match calling host\r

diff --git a/test/stdout/0448 b/test/stdout/0448
index ddb13bd66cbde1d0394f67ba895766a66e71c354..0a42e0ea252fb49045080b7322edcdcebc90553f 100644 (file)
--- a/test/stdout/0448
+++ b/test/stdout/0448
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -15,7 +14,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0451 b/test/stdout/0451
index 2d6bea6becc1be4636b5d01a7077c3a5759cf4f6..92efc311aa2f7c479a749b11a5b438b18f07024b 100644 (file)
--- a/test/stdout/0451
+++ b/test/stdout/0451
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0458 b/test/stdout/0458
index 03b2a5ebcdde128b112f2e9622f84b51c2df242e..47d52c1ac12e3e075b2740192fa00fd236ab6b6d 100644 (file)
--- 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:<userx@test.ex>
@@ -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:<deny@test.ex>
@@ -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:<userx@test.ex>
@@ -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:<userx@test.ex>

diff --git a/test/stdout/0460 b/test/stdout/0460
index f39b5db6197fb127afbb9ff82305f945dfb626b6..1a3462b85fe900b639d59516d57079dd88a9b874 100644 (file)
--- 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:<userx@test.ex>

diff --git a/test/stdout/0473 b/test/stdout/0473
index 8d7f0c5f8cb3c00dc6b022217035df376227504f..9fff9a601a3d87030714d920c0d9cb96e89974a0 100644 (file)
--- a/test/stdout/0473
+++ b/test/stdout/0473
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -27,7 +26,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -37,7 +35,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -47,7 +44,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550-Callout verification failed:\r
@@ -58,7 +54,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 Previous (cached) callout verification failure\r
@@ -68,7 +63,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550-Verification failed for <x9@test.ex>\r
@@ -82,7 +76,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550-Verification failed for <x9@test.ex>\r
@@ -94,7 +87,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -113,7 +105,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 451 Could not complete recipient verify callout\r
@@ -123,7 +114,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 451 Could not complete recipient verify callout\r

diff --git a/test/stdout/0485 b/test/stdout/0485
index 8f0f012e78ad61aed8bdb934b1b793d6d433541d..2fea10b6cbb13b341894800eb63544c5b3591a3c 100644 (file)
--- a/test/stdout/0485
+++ b/test/stdout/0485
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0486 b/test/stdout/0486
index 4b0a5948a480be3bc746d874323cd5258e32d291..e76858efb0ee21bc31f9608fb8995305e8b7e1fd 100644 (file)
--- a/test/stdout/0486
+++ b/test/stdout/0486
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0487 b/test/stdout/0487
index bf6d1f4b678f0a3b87ebbd0b4a3491da6e0784f4..c8452793b8902306fa07bf45e3a3cdf576ea08f5 100644 (file)
--- a/test/stdout/0487
+++ b/test/stdout/0487
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0495 b/test/stdout/0495
index 24db5382df8b6b44e344926742eed60ad9642eec..5c48151b0d87d8c89b38e880b98edda096fac806 100644 (file)
--- a/test/stdout/0495
+++ b/test/stdout/0495
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -16,7 +15,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0513 b/test/stdout/0513
index 560c842a26c5d1b28d5b272b20b5283a8ea2cf73..d0fc6ede19592db8365e65d02690825d61bde726 100644 (file)
--- a/test/stdout/0513
+++ b/test/stdout/0513
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 451 >all relevant MX records point to non-existent hosts< ++++\r

diff --git a/test/stdout/0524 b/test/stdout/0524
index 4143fe4c852392173c69c1a48c2d3b2a7462328d..fad288a29032e2683ee1e9d9743b6080cf229519 100644 (file)
--- a/test/stdout/0524
+++ b/test/stdout/0524
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Reset OK\r
@@ -16,7 +15,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 550 CSA status is fail\r
 221 myhost.test.ex closing connection\r
@@ -30,7 +28,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 550 CSA status is fail\r
 250 Reset OK\r
@@ -38,7 +35,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 550 CSA status is fail\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0536 b/test/stdout/0536
index 8bc415dbee483322ad36f479addb24621196faf0..ff1beab89b816369e5d233766eec8581af1ff816 100644 (file)
--- a/test/stdout/0536
+++ b/test/stdout/0536
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 No code\r
@@ -34,7 +33,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 No code\r

diff --git a/test/stdout/0537 b/test/stdout/0537
index 62e60252faf9b3e15ba6829f43b16321669e6cd3..afbab0d2922d9c70ebf6f3b08316db7e14892c7b 100644 (file)
--- a/test/stdout/0537
+++ b/test/stdout/0537
@@ -15,7 +15,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Reset OK\r
@@ -26,7 +25,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Reset OK\r

diff --git a/test/stdout/0544 b/test/stdout/0544
index a306faaed110c23abc25c4a4182f0c84fa94f9e2..d267fea046c34fb4265c74e84989e8b90bdc507e 100644 (file)
--- a/test/stdout/0544
+++ b/test/stdout/0544
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0546 b/test/stdout/0546
index cc57ab79af8f5f83be7680f684ba920c453cc6c6..c1fc53b5e0bbaa7acecf43a118a734908b643c59 100644 (file)
--- a/test/stdout/0546
+++ b/test/stdout/0546
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 299-MAIL is\r
 299 OK\r
@@ -16,7 +15,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 299-MAIL is\r
 299 OK\r
@@ -27,6 +25,5 @@
 299-SIZE 52428800\r
 299-8BITMIME\r
 299-PIPELINING\r
-299-PRDR\r
 299 HELP\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/0547 b/test/stdout/0547
index b7f749c3752aa03e3e954d88032c58e289315c18..7e931992ca51aacded06b0700207a90a7b777622 100644 (file)
--- 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 382392c45517174f20347a6e6cdce75c27b2c53f..7609d514691b5a01c539f63ede41a1e6ee82f788 100644 (file)
--- 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 1be7b1da7f60a32079df2603c8e480849c14c4e7..73046aaa2899915952b7c57ab32f34ac04bdfc94 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\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:<userx@test.ex>
@@ -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:<userx@test.ex>

diff --git a/test/stdout/0558 b/test/stdout/0558
index adfae0a321acdb71f8acf5726f4223093bacda06..b80b14933a5444bb20f76e0f1cfe7909dc848e8b 100644 (file)
--- a/test/stdout/0558
+++ b/test/stdout/0558
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550-Default deny message\r
@@ -22,7 +21,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550-Default deny message\r

diff --git a/test/stdout/0559 b/test/stdout/0559
index bdc2ce33056ed04ea2aa7a3780377ed9e15a8b7b..b5cc62c4963f82bdc1c6db64c52c2935f3bb7531 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata

diff --git a/test/stdout/0562 b/test/stdout/0562
index 8d05c516c7f21ee2c25b6b317403b93d9a3cdbd7..693fddace4aa1c5cf56c567f08793ddbc1d1a827 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata

diff --git a/test/stdout/0564 b/test/stdout/0564
index d1e6681cb646abd9f21d140f7f54f402e55cd0ff..6f4f06bdb1b6b5428b1fb362c5fa359418feb440 100644 (file)
--- 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:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata

diff --git a/test/stdout/0566 b/test/stdout/0566
index a6982e1b6c69b6d1252cb3d111e2ffa6daccf069..d3465d49edd87709ebc720e34992d6dc90ae77e4 100644 (file)
--- a/test/stdout/0566
+++ b/test/stdout/0566
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -13,7 +12,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -23,7 +21,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -33,7 +30,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -43,7 +39,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -53,7 +48,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -63,7 +57,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -73,7 +66,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -83,7 +75,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 SIZE value too big\r
@@ -93,7 +84,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 SIZE value too big\r
@@ -103,7 +93,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -115,7 +104,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -127,7 +115,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -139,7 +126,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 501 invalid data for BODY\r
 503 sender not yet given\r

diff --git a/test/stdout/1001 b/test/stdout/1001
index bf987a74604780a0b17c1e22e0030c936b9d5533..7ba8eb07c8f5accb2987962bb36863ec66e35288 100644 (file)
--- 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 27a573fb2385badcda914aef037c26d96eb9b757..7b2a47fca3889181b6ccefbce88c19c7298d4231 100644 (file)
--- 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 ca862195def53905bc6e3a61e7234005da3ec9e1..3176f19e653ad3b4d8034d9f57f107b3f5de828e 100644 (file)
--- 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 d6222afe9166b71a84ab3793cbbc25994f8e8d71..ac5245cbaeaf606838ef02e71e57cc636b5b95dd 100644 (file)
--- 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:<userx@test.ex>
@@ -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:<userx@test.ex>

diff --git a/test/stdout/2005 b/test/stdout/2005
index f8eca36c2ff2c534c2b6eae8e84cbc9bf46f910f..7a0430c109bbc3b270e25510d56d43a4da3115a2 100644 (file)
--- 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 1c690c09d614aac3830524c4e4920d5569c6cd92..ba53967e0d2ab022cbc0a17afc7adae42a18f327 100644 (file)
--- 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 685fd2cf055ceb1183254cca9930a9937f2902a4..56c959f20036c50281ea57e5b250670a89a6a2e5 100644 (file)
--- 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 0c2d77305c94c04f24ab49dc57bec51a5c309eb0..fd61740580955cfc358a435bc6884fd2331a2934 100644 (file)
--- 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 7997f084c37b72ed669ba8abce6d3194b0e40865..c7a0df4c43fbb319dc71be636622cbc8117bcf4e 100644 (file)
--- 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:<userx@test.ex>

diff --git a/test/stdout/2019 b/test/stdout/2019
index 6a7361011e6b0e96c2a45f0ee737a54467592b63..b885461ed87f17d2edd327ec68870cfe776a0f4d 100644 (file)
--- 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:<userx@test.ex>

diff --git a/test/stdout/2022 b/test/stdout/2022
index 752d8c747739acc1119d160f4f01a7a53437ac08..c6124c698ffb4024915bd83b29c19a3cbce2fd66 100644 (file)
--- 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 cf2cc6af4093ee296e814344ccd8f33eebd4d809..5022d27b34f6c9014fb25f26b6bb320ed2c8091c 100644 (file)
--- a/test/stdout/2023
+++ b/test/stdout/2023
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/2024 b/test/stdout/2024
index de585a792499944f6ff14d57b662f389128e1e2b..2e30f7dd6bad3110125a56f028551fc22bb0956c 100644 (file)
--- 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 551c884f4c7fa2d94eb2f891bce604b8ab74d305..1ccd96b883ba56d8c044e29da3f5ad31723fbbd4 100644 (file)
--- 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 691ddcba95172a02eb325b863315fa823b3b8f2c..28be7c4215ba77b75345a7106eabb0eb950e488e 100644 (file)
--- 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 a6132d9742d85aec1634f46028cab60e092b5a3f..d3c18a8bfeeecf96402df17ca477126060a14370 100644 (file)
--- 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 dc7b135e89bdfeb513db384511f65f7ffb637def..1c2f41881d8359737c401a8da09aafe677304e95 100644 (file)
--- 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 d6222afe9166b71a84ab3793cbbc25994f8e8d71..ac5245cbaeaf606838ef02e71e57cc636b5b95dd 100644 (file)
--- 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:<userx@test.ex>
@@ -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:<userx@test.ex>

diff --git a/test/stdout/2105 b/test/stdout/2105
index 31a9836e8e9548ea40ecb236e983af6071f6b10e..a9eb350be725af0891096b397168c33069fe4168 100644 (file)
--- 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 597031fce092200c318d1909148f6c4b0a16ba44..cae6e21c84f0d61f412fdfa13c8b38a27d20d960 100644 (file)
--- 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 35ca36e852f4aedf3d54ff0322fc028fccbe6f71..35a69691518aae0da32afce57bba34e7f5cb8e61 100644 (file)
--- 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 0c2d77305c94c04f24ab49dc57bec51a5c309eb0..fd61740580955cfc358a435bc6884fd2331a2934 100644 (file)
--- 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 fd146d8f614d790ba4132ef18b34357acf344522..1709dee8aeca4d1d732d9a6db6593221e862dc9e 100644 (file)
--- 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:<userx@test.ex>

diff --git a/test/stdout/2119 b/test/stdout/2119
index 30e93df1fa8aef088aab9d20cc21604c2582e3f4..0bcff273bcb087df4af4d681d99f5defbf849ca0 100644 (file)
--- 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:<userx@test.ex>

diff --git a/test/stdout/2122 b/test/stdout/2122
index 17c219624da886c1de4722512670b0b6da477f22..4bb92703285fe1ca28c48921a39c449f8eb049e1 100644 (file)
--- 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 cf2cc6af4093ee296e814344ccd8f33eebd4d809..5022d27b34f6c9014fb25f26b6bb320ed2c8091c 100644 (file)
--- a/test/stdout/2123
+++ b/test/stdout/2123
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/2124 b/test/stdout/2124
index 131d3a7c617ab0e9c167b16afc71c54aaf6508db..d2d83d5b6eb0afe6a45c8a621e3dbf516a7a2431 100644 (file)
--- 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 0b45037ffcda0af8aa80a904d08b61e8c4371a9e..795f469d1e4614c64bba9655559723b5d1b62a73 100644 (file)
--- 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 24bfc22dcbf99c7ee4df83aebb2d4535e36aef11..2f55964999625e0fa0b4f52bc606b86977703422 100644 (file)
--- 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 74e02f4b299ce7669ad95e5405578b98f8accf56..4ee74c8775616d66944fd27b4bd5466546c6aa99 100644 (file)
--- a/test/stdout/3000
+++ b/test/stdout/3000
@@ -31,7 +31,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -46,7 +45,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/3208 b/test/stdout/3208
index f788c8ee833f665b52991ed5832f176ecce6f96b..2254a7ea3c3943ea5bc47490d83aa736f465a6e6 100644 (file)
--- a/test/stdout/3208
+++ b/test/stdout/3208
@@ -8,7 +8,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/3400 b/test/stdout/3400
index 94fb810a11b0e26a524502d05c5d151cf87195fc..67add4d54e26b7688910e064f97e0b761af0c90f 100644 (file)
--- a/test/stdout/3400
+++ b/test/stdout/3400
@@ -23,7 +23,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 252 authentication required\r
 550 authentication required\r
@@ -57,7 +56,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 authentication required\r
@@ -74,7 +72,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -108,7 +105,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 221 myhost.test.ex closing connection\r
@@ -120,7 +116,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 435 Unable to authenticate at present: account suspended\r
 221 myhost.test.ex closing connection\r
@@ -132,7 +127,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 535 Incorrect authentication data\r
 500 unrecognized command\r
@@ -145,7 +139,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 VXNlciBOYW1l\r
 334 UGFzc3dvcmQ=\r
@@ -163,7 +156,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 VXNlciBOYW1l\r
 235 Authentication succeeded\r
@@ -176,7 +168,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 221 myhost.test.ex closing connection\r
@@ -188,7 +179,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 UGFzc3dvcmQ=\r
 235 Authentication succeeded\r
@@ -201,7 +191,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 VXNlciBOYW1l\r
 334 UGFzc3dvcmQ=\r
@@ -219,7 +208,6 @@
 250-ETRN\r
 250-EXPN\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
@@ -230,7 +218,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 535 Incorrect authentication data\r
 221 myhost.test.ex closing connection\r
@@ -242,7 +229,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 \r
 235 Authentication succeeded\r
@@ -255,7 +241,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 bXlob3N0LnRlc3QuZXg=\r
 235 Authentication succeeded\r
@@ -268,7 +253,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 435 Unable to authenticate at present\r
 500 unrecognized command\r
@@ -280,7 +264,6 @@
 250-ETRN\r
 250-EXPN\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 503 AUTH command used when not advertised\r
 500 unrecognized command\r
@@ -293,7 +276,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 535 Incorrect authentication data\r
 535 Incorrect authentication data\r
@@ -325,7 +307,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -350,7 +331,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 VXNlciBOYW1l\r
 334 UGFzc3dvcmQ=\r
@@ -364,7 +344,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 221 myhost.test.ex closing connection\r
@@ -375,7 +354,6 @@
 250-ETRN\r
 250-EXPN\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 334 \r
 235 Authentication succeeded\r

diff --git a/test/stdout/3402 b/test/stdout/3402
index 50d520e7b7f0f98e37c70def291deeefd9fbe797..444d46c06f1fcc23f063a3619675ea2a9927a4a0 100644 (file)
--- a/test/stdout/3402
+++ b/test/stdout/3402
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r
@@ -15,7 +14,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r

diff --git a/test/stdout/3403 b/test/stdout/3403
index bb641d31403edaa4b1ae959e365bf293e1d9c1f2..299e3ca67423b287b2bcb130a019797c9c6d8a00 100644 (file)
--- a/test/stdout/3403
+++ b/test/stdout/3403
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 535 Incorrect authentication data\r
 235 Authentication succeeded\r

diff --git a/test/stdout/3406 b/test/stdout/3406
index 99defe8149c6848e7ccb270432398bd9dff1850d..81d58e35018f6e4932875bd8bda4cd94ed88c395 100644 (file)
--- a/test/stdout/3406
+++ b/test/stdout/3406
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH FIRST\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 221 myhost.test.ex closing connection\r
@@ -14,7 +13,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH SECOND\r
-250-PRDR\r
 250 HELP\r
 504 first authentication mechanism not supported\r
 221 myhost.test.ex closing connection\r
@@ -24,7 +22,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH FIRST\r
-250-PRDR\r
 250 HELP\r
 504 second authentication mechanism not supported\r
 221 myhost.test.ex closing connection\r
@@ -34,7 +31,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH SECOND\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/3408 b/test/stdout/3408
index 1846c39b4515f81c23b6700d9140e120364c8ebd..b5fffd08e40df62d142088fa63b74bb9a00c0c7d 100644 (file)
--- a/test/stdout/3408
+++ b/test/stdout/3408
@@ -9,7 +9,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -31,7 +30,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r

diff --git a/test/stdout/3409 b/test/stdout/3409
index ce9f697597773a2cab287025d666a678f463212a..ae2912f20a7bc09e044b0b3a61d9561119116337 100644 (file)
--- a/test/stdout/3409
+++ b/test/stdout/3409
@@ -5,7 +5,6 @@
 250-ETRN\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 501 invalid character in authentication mechanism name\r
 235 Authentication succeeded\r
@@ -19,7 +18,6 @@
 250-ETRN\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 503 not permitted in mail transaction\r

diff --git a/test/stdout/3410 b/test/stdout/3410
index 6bf73b93cf552219bb2cc685a171557526958c07..5c356db81807d12aec441d24bd28d3a6fa2b8d2f 100644 (file)
--- a/test/stdout/3410
+++ b/test/stdout/3410
@@ -12,7 +12,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN LOGIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r
@@ -32,7 +31,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN LOGIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r
@@ -49,7 +47,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN LOGIN\r
-250-PRDR\r
 250 HELP\r
 334 VXNlciBOYW1l\r
 334 UGFzc3dvcmQ=\r

diff --git a/test/stdout/3411 b/test/stdout/3411
index 01fc31727bd53af26b364991b2c50b6b25a1ec90..14230657da36b0e317cfdcf4ca4ab18257323b7d 100644 (file)
--- a/test/stdout/3411
+++ b/test/stdout/3411
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r

diff --git a/test/stdout/3413 b/test/stdout/3413
index d9915d07f6b5a928a7a993ffab500f4638aaf5f0..5370c5e40dd961c2c5d5bd05d8d30095c4e995b3 100644 (file)
--- a/test/stdout/3413
+++ b/test/stdout/3413
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 504 rhubarb authentication mechanism not supported\r
 504 rhubarb authentication mechanism not supported\r

diff --git a/test/stdout/3414 b/test/stdout/3414
index 93927a12054c26b3919d99646156a24d9363bfa5..a96858c192fb8289eab355a1b6dcceb5112d3d8e 100644 (file)
--- a/test/stdout/3414
+++ b/test/stdout/3414
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 221 myhost.test.ex closing connection\r
@@ -14,7 +13,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 221 myhost.test.ex closing connection\r
@@ -24,7 +22,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 221 myhost.test.ex closing connection\r
@@ -34,7 +31,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r
@@ -45,7 +41,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 235 Authentication succeeded\r
 250 OK\r
@@ -56,7 +51,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-AUTH PLAIN\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Reset OK\r

diff --git a/test/stdout/3415 b/test/stdout/3415
index 899f2910fffbd0cf59e8aed54bd0121c51cbcc51..f675c6c74d45883a1dd1084695c9a9153448daf4 100644 (file)
--- 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 e94f2ead8c3fcd8a13fb946064770b135507f202..1bd2e21d2d68a8342d361694da4eb953112a4dd0 100644 (file)
--- 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 dc8155dabd2410b6d5d0dfd990f61ae80db38c59..098973d425fe172d791d755b20f4faa7d3b423a8 100644 (file)
--- 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 574f58facb621a166489dea57afcdc592704e8e9..ae2eab337cbcb479a844bb79457a9f14671272bc 100644 (file)
--- 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 4b6179f78540a9d8196cb319f5715c8f3b68aa6d..92c47970f9bbdd497181d908973c692c7ecd2413 100644 (file)
--- 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 cb6132175fbef93e1b0d69447596a2f2e798d4fe..68b1b55c0fe7f843f2afcacebb3adf3d276ca608 100644 (file)
--- 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 f5798dcafe92029a30a75ee9da3803bdef1055ed..46f1c37298bc3312fbf8df4de0fae9e817b0da88 100644 (file)
--- 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 5e2eb83bf0680b4aadde9ddad91ad22412c79990..634ac1ecd1500499195e21d6c3361bb2d76de6e3 100644 (file)
--- a/test/stdout/3500
+++ b/test/stdout/3500
@@ -6,7 +6,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
-250-PRDR\r
 250 HELP\r
 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+\r
 235 Authentication succeeded\r
@@ -23,7 +22,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
-250-PRDR\r
 250 HELP\r
 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+\r
 235 Authentication succeeded\r
@@ -40,7 +38,6 @@
 250-ETRN\r
 250-EXPN\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 221 myhost.test.ex closing connection\r
 
@@ -56,7 +53,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
-250-PRDR\r
 250 HELP\r
 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+\r
 235 Authentication succeeded\r
@@ -81,7 +77,6 @@
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
-250-PRDR\r
 250 HELP\r
 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+\r
 535 Incorrect authentication data\r

diff --git a/test/stdout/3600 b/test/stdout/3600
index db643597816119496e920f7ad934850b01a561e7..7d37079456ead96cc378aba31f046006ffc4e90c 100644 (file)
--- 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 8ce7a2ef82dabc91395b496d1fe321799f01d337..532eb41d7b1d44ae1edc63aabcc9a304b43e5e85 100644 (file)
--- a/test/stdout/5204
+++ b/test/stdout/5204
@@ -23,7 +23,6 @@ postmaster@test.ex
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 550 cannot route this one (FAIL)\r

diff --git a/test/stdout/5400 b/test/stdout/5400
index d8268d8cbb0b0e9d19aca5c26ed189852bb19197..74c2d235880815c38e94028bea36595666a30e22 100644 (file)
--- a/test/stdout/5400
+++ b/test/stdout/5400
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -15,7 +14,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -27,7 +25,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/5401 b/test/stdout/5401
index 72b6e3ed221ccf5815fcbdfc2ab1e221c430d3e6..1ceb0bffb466f1187b0184402a36750f7e3cd7d4 100644 (file)
--- a/test/stdout/5401
+++ b/test/stdout/5401
@@ -3,7 +3,6 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/5410 b/test/stdout/5410
index 7b81b220cbf2e5450f279077cef0f07e2bd37eb2..edf01f8baf3b36f9fc1e0cf4aacbc3f1c2767a55 100644 (file)
--- a/test/stdout/5410
+++ b/test/stdout/5410
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -17,7 +16,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -30,7 +28,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/5420 b/test/stdout/5420
index 7b81b220cbf2e5450f279077cef0f07e2bd37eb2..edf01f8baf3b36f9fc1e0cf4aacbc3f1c2767a55 100644 (file)
--- a/test/stdout/5420
+++ b/test/stdout/5420
@@ -4,7 +4,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -17,7 +16,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
@@ -30,7 +28,6 @@
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
-250-PRDR\r
 250 HELP\r
 250 OK\r
 250 Accepted\r