SPF: fix handling mix of spf and other txt records. Bug 2499

[exim.git] / test / stderr / 0396

diff --git a/test/stderr/0396 b/test/stderr/0396
index 36700ad73d1cfc34035b090788fe19ae248e666c..ec7a14c9b1258dbb0b4903cdb000dc26ff563b5d 100644 (file)
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -14,13 +14,15 @@ LOG: smtp_connection MAIN
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
-processing "accept"
+processing "accept" (TESTSUITE/test-config 12)
 check domains = +fail
 expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
 y in "+fail"? no (end of list)
-accept: condition test failed
+accept: condition test failed in inline ACL
 end of inline ACL: implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
@@ -31,4 +33,4 @@ SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>