Lookups: sub-path for dsearch

[exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index bcf5f0393d78d86bba55c820f47a0a019bc5f36a..5bcd5a1ceafe41c69e9355b88a1a081b4def7525 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -29,7 +29,7 @@ SMTP>> 501 <abc@domain.>: domain missing or malformed
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed)
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed)


@@ -69,22 +69,22 @@ search_tidyup called
 To: abc@domain.
 
 qualify & rewrite recipients list
 To: abc@domain.
 
 qualify & rewrite recipients list

-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers

  rewrite_one_header: type=T:
    To: abc@domain.
 search_tidyup called
 >>Headers after rewriting and local additions:
  rewrite_one_header: type=T:
    To: abc@domain.
 search_tidyup called
 >>Headers after rewriting and local additions:

-T To: abc@domain.
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ T To: abc@domain.
+ I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 

-Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
-Data file written for message 10HmaY-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
+Data file written for message 10HmaY-000000005vi-0000

 >>Generated Received: header line
 P Received: from CALLER (helo=test)
        by myhost.test.ex with local-smtp (Exim x.yz)
 >>Generated Received: header line
 P Received: from CALLER (helo=test)
        by myhost.test.ex with local-smtp (Exim x.yz)

-       id 10HmaY-0005vi-00
+       id 10HmaY-000000005vi-0000

        for abc@domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
        for abc@domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"


@@ -92,19 +92,19 @@ processing "accept" (TESTSUITE/test-config 20)
 check verify = header_syntax
 accept: condition test succeeded in ACL "check_data"
 end of ACL "check_data": ACCEPT
 check verify = header_syntax
 accept: condition test succeeded in ACL "check_data"
 end of ACL "check_data": ACCEPT

-Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000

 DSN: **** SPOOL_OUT - address: <abc@domain> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <abc@domain> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0

-Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
+Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H

 Size of headers = sss
 LOG: MAIN
   <= <> U=CALLER P=local-smtp S=sss
 created log directory TESTSUITE/spool/log
 Size of headers = sss
 LOG: MAIN
   <= <> U=CALLER P=local-smtp S=sss
 created log directory TESTSUITE/spool/log

-SMTP>> 250 OK id=10HmaY-0005vi-00
+SMTP>> 250 OK id=10HmaY-000000005vi-0000

 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -143,22 +143,24 @@ search_tidyup called
 To: abc@xyz.
 
 qualify & rewrite recipients list
 To: abc@xyz.
 
 qualify & rewrite recipients list

-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers

  rewrite_one_header: type=T:
    To: abc@xyz.
  rewrite_one_header: type=T:
    To: abc@xyz.

+LOG: MAIN
+  qualify/rewrite: domain missing or malformed

 search_tidyup called
 >>Headers after rewriting and local additions:
 search_tidyup called
 >>Headers after rewriting and local additions:

-T To: abc@xyz.
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ T To: abc@xyz.
+ I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 

-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 CALLER (helo=test)
        by myhost.test.ex with local-smtp (Exim x.yz)
 >>Generated Received: header line
 P Received: from CALLER (helo=test)
        by myhost.test.ex with local-smtp (Exim x.yz)

-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000

        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"


@@ -173,6 +175,6 @@ smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>