tidying

[exim.git] / test / stderr / 0294

diff --git a/test/stderr/0294 b/test/stderr/0294
index afffd2f51c52b80650c744005e9c2c38b649342e..47af581ab3aee79012df0a7484b9bbe194fc8c9b 100644 (file)
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -15,27 +16,32 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
+one in "reject"? no (end of list)
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.25 sec
+one in "reject"? no (end of list)
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.263 sec
+one in "reject"? no (end of list)
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.276 sec
+one in "reject"? no (end of list)
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.289 sec
+one in "reject"? no (end of list)
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
-F From: x@y
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
+ F From: x@y
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000
@@ -59,15 +65,16 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<two@z>
+two in "reject"? no (end of list)
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
-F From: x@y
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
+ F From: x@y
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
 Data file written for message 10HmaY-000000005vi-0000
@@ -96,6 +103,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -124,13 +132,13 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
-processing "deny" (TESTSUITE/test-config 35)
+processing inline ACL "deny"
 check local_parts = reject
 one in "reject"?
  list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
-processing "accept" (TESTSUITE/test-config 35)
+processing inline ACL "accept"
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
@@ -139,13 +147,13 @@ host in smtp_ratelimit_hosts?
  list element: 
  list element: V4NET.9.8.7
 host in smtp_ratelimit_hosts? no (end of list)
-processing "deny" (TESTSUITE/test-config 35)
+processing inline ACL "deny"
 check local_parts = reject
 one in "reject"?
  list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
-processing "accept" (TESTSUITE/test-config 35)
+processing inline ACL "accept"
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
@@ -155,6 +163,7 @@ LOG: smtp_connection MAIN
   SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -183,13 +192,13 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
-processing "deny" (TESTSUITE/test-config 35)
+processing inline ACL "deny"
 check local_parts = reject
 one in "reject"?
  list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
-processing "accept" (TESTSUITE/test-config 35)
+processing inline ACL "accept"
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
@@ -199,13 +208,13 @@ host in smtp_ratelimit_hosts?
  list element: V4NET.9.8.7
   host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
 rate limit RCPT: delay 0.25 sec
-processing "deny" (TESTSUITE/test-config 35)
+processing inline ACL "deny"
 check local_parts = reject
 one in "reject"?
  list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
-processing "accept" (TESTSUITE/test-config 35)
+processing inline ACL "accept"
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
@@ -215,6 +224,7 @@ LOG: smtp_connection MAIN
   SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user