Hintsdb sqlite: use transaction rather than file lock

[exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 41ad3ff50a89e8d192607b690473addcdf477d2a..6795f8dac51509630c0590f90cfd500a6b00136e 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -1,10 +1,11 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.0.0.0]
@@ -31,15 +32,24 @@ end of ACL "connect": ACCEPT
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something
+something in helo_lookup_domains?
+ list element: @
+ list element: @[]
 something in helo_lookup_domains? no (end of list)
 sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
+ list element: *
+  host in limits_advertise_hosts? yes (matched "*")
 host in dsn_advertise_hosts? no (option unset)
-host in pipelining_advertise_hosts? yes (matched "*")
+host in pipelining_advertise_hosts?
+ list element: *
+  host in pipelining_advertise_hosts? yes (matched "*")
+host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
        250-SIZE 52428800
+       250-LIMITS MAILMAX=1000 RCPTMAX=50000
        250-8BITMIME
        250-VRFY
        250-PIPELINING
@@ -76,18 +86,18 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
-Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
-Data file written for message 10HmaX-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+Data file written for message 10HmaX-000000005vi-0000
 >>Generated Received: header line
 P Received: from [V4NET.0.0.0] (helo=something)
        by mail.test.ex with esmtp (Exim x.yz)
        (envelope-from <x@y>)
-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "data"
@@ -100,10 +110,12 @@ accept: condition test succeeded in ACL "data"
 end of ACL "data": ACCEPT
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
-SMTP>> 250 OK id=10HmaX-0005vi-00
+SMTP>> 250 OK id=10HmaX-000000005vi-0000
 smtp_setup_msg entered
 SMTP<< vrfy x@y
-host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+host in smtp_accept_max_nonmail_hosts?
+ list element: *
+  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 using ACL "vrfy"
 processing "accept" (TESTSUITE/test-config 41)
 check set acl_c0 = $acl_c0; vrfy
@@ -141,6 +153,6 @@ SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (something) [V4NET.0.0.0] D=qqs closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>