From efdec7f5befe7f67e3e7f9f93b180a0a5bb8ac02 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Apr 2012 21:05:20 +0100 Subject: [PATCH] Testcase changes to match changes introduced by bug 1214. Additional "A=" authenticator info was added to log lines for rejections. --- test/log/3411 | 2 +- test/rejectlog/3411 | 2 +- test/stderr/3400 | 2 +- test/stderr/3410 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/log/3411 b/test/log/3411 index f7179303f..639399960 100644 --- a/test/log/3411 +++ b/test/log/3411 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 H=(rhu.barb) [10.0.0.0] U=CALLER F= rejected RCPT : Unrouteable address +1999-03-02 09:44:33 H=(rhu.barb) [10.0.0.0] U=CALLER F= A=plain rejected RCPT : Unrouteable address 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [10.0.0.0] U=CALLER P=esmtpa A=plain S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => postmaster R=r2 T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx R=r2 T=local_delivery diff --git a/test/rejectlog/3411 b/test/rejectlog/3411 index 0f325a292..2d140af13 100644 --- a/test/rejectlog/3411 +++ b/test/rejectlog/3411 @@ -1 +1 @@ -1999-03-02 09:44:33 H=(rhu.barb) [10.0.0.0] U=CALLER F= rejected RCPT : Unrouteable address +1999-03-02 09:44:33 H=(rhu.barb) [10.0.0.0] U=CALLER F= A=plain rejected RCPT : Unrouteable address diff --git a/test/stderr/3400 b/test/stderr/3400 index 896c60266..598fe2f1a 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -187,7 +187,7 @@ LOG: H=(test.host) [10.0.0.1] F= rejected RCPT >> accept: condition test failed >>> processing "deny" >>> deny: condition test succeeded -LOG: H=(test.host) [10.0.0.1] F= rejected RCPT : relay not permitted +LOG: H=(test.host) [10.0.0.1] F= A=mylogin rejected RCPT : relay not permitted >>> using ACL "check_vrfy" >>> processing "deny" >>> check hosts = +auth_hosts diff --git a/test/stderr/3410 b/test/stderr/3410 index b7cdcf399..43f531668 100644 --- a/test/stderr/3410 +++ b/test/stderr/3410 @@ -81,4 +81,4 @@ LOG: H=[5.6.10.1] F= rejected RCPT >>> auth2 in "auth1"? no (end of list) >>> accept: condition test failed >>> end of ACL "acl_5_6_10": implicit DENY -LOG: H=(rhu.barb) [5.6.10.1] F= rejected RCPT +LOG: H=(rhu.barb) [5.6.10.1] F= A=auth2 rejected RCPT -- 2.30.2