From: root <jgh146exb@wizmail.org>
Date: Tue, 17 Apr 2012 20:05:20 +0000 (+0100)
Subject: Testcase changes to match changes introduced by bug 1214.
X-Git-Tag: exim-4_80_RC1~69
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=efdec7f5befe7f67e3e7f9f93b180a0a5bb8ac02;p=exim.git

Testcase changes to match changes introduced by bug 1214.

Additional "A=" authenticator info was added to log lines for rejections.
---

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>