Hintsbd: fix locking

[exim.git] / test / stderr / 0044

diff --git a/test/stderr/0044 b/test/stderr/0044
index b4ff34a263d5d34c901618f87589a6b7ced83cf9..0365875befc9cb5020cf009c84139f4b7c03affd 100644 (file)
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -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
@@ -32,6 +33,8 @@ exim.test.ex in helo_lookup_domains? no (end of list)
 sender_fullhost = (exim.test.ex) [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (helo=exim.test.ex)
 set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.11.12.13]
+ list element: *
+  host in limits_advertise_hosts? yes (matched "*")
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
@@ -40,6 +43,7 @@ host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.11.12.13]
        250-SIZE 52428800
+       250-LIMITS MAILMAX=1000 RCPTMAX=50000
        250-8BITMIME
        250-PIPELINING
        250 HELP
@@ -147,23 +151,23 @@ host in ignore_fromline_hosts? no (option unset)
 >>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.11.12.13] (helo=exim.test.ex)
        by the.local.host.name with esmtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000
        for postmaster@exim.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss
-SMTP>> 250 OK id=10HmaX-0005vi-00
+SMTP>> 250 OK id=10HmaX-000000005vi-0000
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
@@ -183,6 +187,8 @@ search_tidyup called
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -213,8 +219,9 @@ search_tidyup called
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaY-0005vi-00 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss
+LOG: 10HmaY-000000005vi-0000 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 configuration file is TESTSUITE/test-config
@@ -248,6 +255,8 @@ exim.test.ex in helo_lookup_domains? no (end of list)
 sender_fullhost = (exim.test.ex) [V4NET.99.99.99]
 sender_rcvhost = [V4NET.99.99.99] (helo=exim.test.ex)
 set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.99.99.99]
+ list element: *
+  host in limits_advertise_hosts? yes (matched "*")
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
@@ -256,6 +265,7 @@ host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.99.99.99]
        250-SIZE 52428800
+       250-LIMITS MAILMAX=1000 RCPTMAX=50000
        250-8BITMIME
        250-PIPELINING
        250 HELP
@@ -311,9 +321,9 @@ routing postmaster@exim.test.ex
 --------> localuser router <--------
 local_part=postmaster domain=exim.test.ex
 checking local_parts
-postmaster in "userx"?
+postmaster in local_parts?
  list element: userx
-postmaster in "userx"? no (end of list)
+postmaster in local_parts? no (end of list)
 localuser router skipped: local_parts mismatch
 no more routers
 ----------- end verify ------------