git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cutthrough: option to use transport-defined mailfrom. Bug 3071
[exim.git] / test / stderr / 0471
diff --git a/test/stderr/0471 b/test/stderr/0471
index a83a4921f7eb4f1df798f3056ba7e7eb8e6d04bd..90bc9dacf193e58668f8fdc034d42cae09bafeed 100644 (file)
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -16,9 +16,9 @@ Recipients:
   r1@test.ex
 search_tidyup called
 >>Headers received:
   r1@test.ex
 search_tidyup called
 >>Headers received:
-To: random@test.example,
-    random@test.example,
-    random@test.example,
+ To: random@test.example,
+     random@test.example,
+     random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
@@ -96,7 +96,6 @@ To: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
     random@test.example,
- 
 **** debug string too long - truncated ****
 
 qualify & rewrite recipients list
 **** debug string too long - truncated ****
 
 qualify & rewrite recipients list
@@ -26871,12 +26870,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for r1@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
        for r1@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
-processing "warn" (TESTSUITE/test-config 15)
+processing ACL check "warn" (TESTSUITE/test-config 15)
 check !verify = header_syntax
 check !verify = header_syntax
-warn: condition test failed in ACL "check"
-processing "accept" (TESTSUITE/test-config 17)
-accept: condition test succeeded in ACL "check"
-end of ACL "check": ACCEPT
+warn: condition test failed in ACL check
+processing ACL check "accept" (TESTSUITE/test-config 17)
+accept: condition test succeeded in ACL check
+end of ACL check: ACCEPT
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r1@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r1@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H
@@ -26884,6 +26883,7 @@ Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
+receive_msg: tidyup
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -26904,7 +26904,7 @@ Recipients:
   r2@test.ex
 search_tidyup called
 >>Headers received:
   r2@test.ex
 search_tidyup called
 >>Headers received:
-To: localpart_with_056_chars_56789012345678901234567890123456@test.example
+ To: localpart_with_056_chars_56789012345678901234567890123456@test.example
 
 qualify & rewrite recipients list
  r2@test.ex in "^.{40,}@*"?
 
 qualify & rewrite recipients list
  r2@test.ex in "^.{40,}@*"?
@@ -27069,18 +27069,19 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for r2@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
        for r2@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
-processing "warn" (TESTSUITE/test-config 15)
+processing ACL check "warn" (TESTSUITE/test-config 15)
 check !verify = header_syntax
 check !verify = header_syntax
-warn: condition test failed in ACL "check"
-processing "accept" (TESTSUITE/test-config 17)
-accept: condition test succeeded in ACL "check"
-end of ACL "check": ACCEPT
+warn: condition test failed in ACL check
+processing ACL check "accept" (TESTSUITE/test-config 17)
+accept: condition test succeeded in ACL check
+end of ACL check: ACCEPT
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+receive_msg: tidyup
 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 ....
@@ -27101,7 +27102,7 @@ Recipients:
   r3@test.ex
 search_tidyup called
 >>Headers received:
   r3@test.ex
 search_tidyup called
 >>Headers received:
-To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
+ To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
 
 qualify & rewrite recipients list
  r3@test.ex in "^.{40,}@*"?
 
 qualify & rewrite recipients list
  r3@test.ex in "^.{40,}@*"?
@@ -27266,18 +27267,19 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for r3@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
        for r3@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
-processing "warn" (TESTSUITE/test-config 15)
+processing ACL check "warn" (TESTSUITE/test-config 15)
 check !verify = header_syntax
 check !verify = header_syntax
-warn: condition test failed in ACL "check"
-processing "accept" (TESTSUITE/test-config 17)
-accept: condition test succeeded in ACL "check"
-end of ACL "check": ACCEPT
+warn: condition test failed in ACL check
+processing ACL check "accept" (TESTSUITE/test-config 17)
+accept: condition test succeeded in ACL check
+end of ACL check: ACCEPT
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r3@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r3@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+receive_msg: tidyup
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -27298,7 +27300,7 @@ Recipients:
   r4@test.ex
 search_tidyup called
 >>Headers received:
   r4@test.ex
 search_tidyup called
 >>Headers received:
-To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
+ To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
 
 qualify & rewrite recipients list
  r4@test.ex in "^.{40,}@*"?
 
 qualify & rewrite recipients list
  r4@test.ex in "^.{40,}@*"?
@@ -27432,21 +27434,22 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for r4@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
        for r4@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
-processing "warn" (TESTSUITE/test-config 15)
+processing ACL check "warn" (TESTSUITE/test-config 15)
 check !verify = header_syntax
 check logwrite = verify header_syntax fails
 LOG: MAIN
   verify header_syntax fails
 check !verify = header_syntax
 check logwrite = verify header_syntax fails
 LOG: MAIN
   verify header_syntax fails
-warn: condition test succeeded in ACL "check"
-processing "accept" (TESTSUITE/test-config 17)
-accept: condition test succeeded in ACL "check"
-end of ACL "check": ACCEPT
+warn: condition test succeeded in ACL check
+processing ACL check "accept" (TESTSUITE/test-config 17)
+accept: condition test succeeded in ACL check
+end of ACL check: ACCEPT
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r4@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r4@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+receive_msg: tidyup
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -27467,7 +27470,7 @@ Recipients:
   r5@test.ex
 search_tidyup called
 >>Headers received:
   r5@test.ex
 search_tidyup called
 >>Headers received:
-To: undisclosed recpients:;
+ To: undisclosed recpients:;
 
 qualify & rewrite recipients list
  r5@test.ex in "^.{40,}@*"?
 
 qualify & rewrite recipients list
  r5@test.ex in "^.{40,}@*"?
@@ -27599,18 +27602,19 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for r5@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
        for r5@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
-processing "warn" (TESTSUITE/test-config 15)
+processing ACL check "warn" (TESTSUITE/test-config 15)
 check !verify = header_syntax
 check !verify = header_syntax
-warn: condition test failed in ACL "check"
-processing "accept" (TESTSUITE/test-config 17)
-accept: condition test succeeded in ACL "check"
-end of ACL "check": ACCEPT
+warn: condition test failed in ACL check
+processing ACL check "accept" (TESTSUITE/test-config 17)
+accept: condition test succeeded in ACL check
+end of ACL check: ACCEPT
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r5@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbB-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r5@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbB-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+receive_msg: tidyup
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -27631,7 +27635,7 @@ Recipients:
   r6@test.ex
 search_tidyup called
 >>Headers received:
   r6@test.ex
 search_tidyup called
 >>Headers received:
-To: fred@
+ To: fred@
 
 qualify & rewrite recipients list
  r6@test.ex in "^.{40,}@*"?
 
 qualify & rewrite recipients list
  r6@test.ex in "^.{40,}@*"?
@@ -27765,20 +27769,21 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for r6@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
        for r6@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check"
-processing "warn" (TESTSUITE/test-config 15)
+processing ACL check "warn" (TESTSUITE/test-config 15)
 check !verify = header_syntax
 check logwrite = verify header_syntax fails
 LOG: MAIN
   verify header_syntax fails
 check !verify = header_syntax
 check logwrite = verify header_syntax fails
 LOG: MAIN
   verify header_syntax fails
-warn: condition test succeeded in ACL "check"
-processing "accept" (TESTSUITE/test-config 17)
-accept: condition test succeeded in ACL "check"
-end of ACL "check": ACCEPT
+warn: condition test succeeded in ACL check
+processing ACL check "accept" (TESTSUITE/test-config 17)
+accept: condition test succeeded in ACL check
+end of ACL check: ACCEPT
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r6@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbC-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <r6@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbC-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+receive_msg: tidyup
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository