From d889e47a639472f1d5ad92231b90735bc8e42d37 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 17 Jan 2016 22:44:46 +0000 Subject: [PATCH] Testsuite: changes for VFRY update, 4f6ae5c314e5 --- test/log/0562 | 5 +---- test/rejectlog/0562 | 5 +---- test/scripts/0000-Basic/0562 | 8 ++++---- test/stdout/0562 | 14 +++++++------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/test/log/0562 b/test/log/0562 index 43b67db11..0f19e9cf4 100644 --- a/test/log/0562 +++ b/test/log/0562 @@ -6,10 +6,7 @@ 1999-03-02 09:44:33 NOTQUIT reason: 'connection-lost' 1999-03-02 09:44:33 NOTQUIT reason: 'bad-commands' 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown") -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY foo@bar 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy") 1999-03-02 09:44:33 NOTQUIT reason: 'bad-commands' 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(abcd) [127.0.0.1] F= rejected after DATA diff --git a/test/rejectlog/0562 b/test/rejectlog/0562 index d10c450f6..951f79e39 100644 --- a/test/rejectlog/0562 +++ b/test/rejectlog/0562 @@ -1,8 +1,5 @@ 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown") -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY -1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY foo@bar 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy") 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(abcd) [127.0.0.1] F= rejected after DATA Envelope-from: diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562 index 9355c46fc..b829dff30 100644 --- a/test/scripts/0000-Basic/0562 +++ b/test/scripts/0000-Basic/0562 @@ -39,13 +39,13 @@ unknown client 127.0.0.1 PORT_D ??? 220 vrfy +??? 501 +vrfy foo@bar ??? 252 vrfy -??? 252 -vrfy -??? 252 +??? 501 vrfy -??? 252 +??? 501 vrfy ??? 554 **** diff --git a/test/stdout/0562 b/test/stdout/0562 index 693fddace..a32896899 100644 --- a/test/stdout/0562 +++ b/test/stdout/0562 @@ -51,17 +51,17 @@ 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 >>> vrfy +??? 501 +<<< 501 empty address +>>> vrfy foo@bar ??? 252 <<< 252 Administrative prohibition >>> vrfy -??? 252 -<<< 252 Administrative prohibition +??? 501 +<<< 501 empty address >>> vrfy -??? 252 -<<< 252 Administrative prohibition ->>> vrfy -??? 252 -<<< 252 Administrative prohibition +??? 501 +<<< 501 empty address >>> vrfy ??? 554 <<< 554 Too many nonmail commands -- 2.25.1