Fix mismerge

[exim.git] / test / stderr / 0426

diff --git a/test/stderr/0426 b/test/stderr/0426
index 9918563ad10856f6f5f01a958d81664f0cc68ae9..4503efa2dc79ef581a9bc0dc2f9724cc05eab0d7 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -1,15 +1,16 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@uppercase.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@uppercase.test.ex


@@ -20,21 +21,27 @@ routing x@uppercase.test.ex
 --------> r0 router <--------
 local_part=x domain=uppercase.test.ex
 checking senders
 --------> r0 router <--------
 local_part=x domain=uppercase.test.ex
 checking senders

+test.ex in ""? no (end of list)
+CALLER@test.ex in senders? no (end of list)

 r0 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=x domain=uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex
 r0 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=x domain=uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex

-local host found for non-MX address
-fully qualified name = UpperCase.test.ex
-uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+ check dnssec request list
+ uppercase.test.ex (MX resp) DNSSEC
+ local host found for non-MX address
+ fully qualified name = UpperCase.test.ex
+ uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 

 remote host address is the local host: uppercase.test.ex: configured to try delivery anyway
 set transport t1
 queued for t1 transport: local_part = x
 domain = uppercase.test.ex
   errors_to=NULL
 remote host address is the local host: uppercase.test.ex: configured to try delivery anyway
 set transport t1
 queued for t1 transport: local_part = x
 domain = uppercase.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r1 router
   envelope to: x@UpperCase.test.ex
   transport: t1
 routed by r1 router
   envelope to: x@UpperCase.test.ex
   transport: t1


@@ -46,22 +53,23 @@ After routing:
     x@UpperCase.test.ex
   Failed addresses:
   Deferred addresses:
     x@UpperCase.test.ex
   Failed addresses:
   Deferred addresses:

-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 Exim version x.yz ....
 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN

-  <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+  <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss

 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@test.ex


@@ -73,8 +81,8 @@ routing CALLER@test.ex
 local_part=CALLER domain=test.ex
 checking senders
 calling r0 router
 local_part=CALLER domain=test.ex
 checking senders
 calling r0 router

-rda_interpret (string): :blackhole:
-expanded: :blackhole:
+rda_interpret (string): ':blackhole:'
+expanded: ':blackhole:'

 file is not a filter file
 parse_forward_list: :blackhole:
 extract item: :blackhole:
 file is not a filter file
 parse_forward_list: :blackhole:
 extract item: :blackhole:


@@ -89,9 +97,9 @@ After routing:
   Deferred addresses:
 LOG: MAIN
   Completed
   Deferred addresses:
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>