diff options
| author | root <jgh146exb@wizmail.org> | 2012-04-17 21:05:20 +0100 |
|---|---|---|
| committer | root <jgh146exb@wizmail.org> | 2012-04-17 21:05:20 +0100 |
| commit | efdec7f5befe7f67e3e7f9f93b180a0a5bb8ac02 (patch) | |
| tree | ac61a5a9d08b91bb7446024ae5eb56291539cdf3 | |
| parent | aa3de463f5eed2b8552c61624adbdac824f80951 (diff) | |
Testcase changes to match changes introduced by bug 1214.
Additional "A=" authenticator info was added to log lines for rejections.
| -rw-r--r-- | test/log/3411 | 2 | ||||
| -rw-r--r-- | test/rejectlog/3411 | 2 | ||||
| -rw-r--r-- | test/stderr/3400 | 2 | ||||
| -rw-r--r-- | 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=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address +1999-03-02 09:44:33 H=(rhu.barb) [10.0.0.0] U=CALLER F=<userx@test.ex> A=plain rejected RCPT <x@y>: 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 <postmaster@test.ex> R=r2 T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> 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=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address +1999-03-02 09:44:33 H=(rhu.barb) [10.0.0.0] U=CALLER F=<userx@test.ex> A=plain rejected RCPT <x@y>: 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=<junk@jink.jonk.test.ex> rejected RCPT <userx@te >>> accept: condition test failed >>> processing "deny" >>> deny: condition test succeeded -LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cus.cam.ac.uk>: relay not permitted +LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> A=mylogin rejected RCPT <userx@cus.cam.ac.uk>: 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=<x@y> rejected RCPT <x@y> >>> 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=<x@y> rejected RCPT <x@y> +LOG: H=(rhu.barb) [5.6.10.1] F=<x@y> A=auth2 rejected RCPT <x@y> |