Drop over-tight errorcheck.

[exim.git] / test / stderr / 0479

diff --git a/test/stderr/0479 b/test/stderr/0479
index 548466bfa4214aa809fbbb5fa9a363092eb63d3d..9b12968a663a83f27e8350b7f3ea09d1e2b4fc0b 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
@@ -20,8 +21,6 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-host in pipelining_connect_advertise_hosts?
- list element: 
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo [1.2.3.4]
@@ -39,7 +38,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "rcpt"
-processing "require" (TESTSUITE/test-config 16)
+processing ACL rcpt "require" (TESTSUITE/test-config 16)
 check logwrite = sender address is <$sender_address>
                = sender address is <a@b>
 LOG: MAIN
@@ -75,28 +74,28 @@ routed by r1 router
   transport: t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
-require: condition test succeeded in ACL "rcpt"
-processing "accept" (TESTSUITE/test-config 18)
-accept: condition test succeeded in ACL "rcpt"
-end of ACL "rcpt": ACCEPT
+require: condition test succeeded in ACL rcpt
+processing ACL rcpt "accept" (TESTSUITE/test-config 18)
+accept: condition test succeeded in ACL rcpt
+end of ACL rcpt: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
-processing "require" (TESTSUITE/test-config 16)
+processing ACL rcpt "require" (TESTSUITE/test-config 16)
 check logwrite = sender address is <$sender_address>
                = sender address is <rewritten-a@rewritten-b>
 LOG: MAIN
   sender address is <rewritten-a@rewritten-b>
 check verify = sender
 using cached sender verify result
-require: condition test succeeded in ACL "rcpt"
-processing "accept" (TESTSUITE/test-config 18)
-accept: condition test succeeded in ACL "rcpt"
-end of ACL "rcpt": ACCEPT
+require: condition test succeeded in ACL rcpt
+processing ACL rcpt "accept" (TESTSUITE/test-config 18)
+accept: condition test succeeded in ACL rcpt
+end of ACL rcpt: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
+  SMTP connection from ([1.2.3.4]) [1.2.3.4] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>