Merge branch 'master' of ssh://git.exim.org/home/git/exim

[users/heiko/exim.git] / test / stderr / 0294

diff --git a/test/stderr/0294 b/test/stderr/0294
index 896e8ea39681f96951628d7ea9c6736eec7bd7fb..3b09873e20ae303952599d1baf54e025f894530d 100644 (file)
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -29,9 +29,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: x@y
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -57,9 +57,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: x@y
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
@@ -107,18 +107,18 @@ SMTP<< rcpt to:<one@z>
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 host in smtp_ratelimit_hosts? no (end of list)
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
@@ -149,9 +149,9 @@ SMTP<< rcpt to:<one@z>
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
@@ -159,9 +159,9 @@ rate limit RCPT: delay 0.25 sec
 processing "deny"
 check local_parts = reject
 one in "reject"? no (end of list)
-deny: condition test failed
+deny: condition test failed in inline ACL
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection