X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..82ab9af25b43cb3b56a95383eba52a866400911a:/test/stderr/0471?ds=inline diff --git a/test/stderr/0471 b/test/stderr/0471 index 9b1482ab7..a0950c7a3 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -131,7 +131,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -171,7 +171,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: random@test.example, random@test.example, @@ -26701,9 +26701,8 @@ remainder: lookup failed search_tidyup called >>Headers after rewriting and local additions: -* 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, @@ -26781,8 +26780,11 @@ search_tidyup called random@test.example, random@test.example, random@test.example, + random@test.example **** debug string too long - truncated **** -T To: random@rwtest.example, + T To: random@rwtest.example, + random@rwtest.example, + random@rwtest.example, random@rwtest.example, random@rwtest.example, random@rwtest.example, @@ -26854,20 +26856,17 @@ T To: random@rwtest.example, random@rwtest.example, random@rwtest.example, random@rwtest.example, - random@rwtest.example, - random@rwtest.example, - **** debug string too long - truncated **** -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + 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 by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -26877,9 +26876,9 @@ 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -26938,7 +26937,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -26978,7 +26977,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: localpart_with_056_chars_56789012345678901234567890123456@test.example localpart_with_056_chars_56789012345678901234567890123456@test.example in "^.{40,}@*"? @@ -27053,18 +27052,18 @@ remainder: lookup failed search_tidyup called >>Headers after rewriting and local additions: -* To: localpart_with_056_chars_56789012345678901234567890123456@test.example -T To: deny_me@rwtest.example -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + * To: localpart_with_056_chars_56789012345678901234567890123456@test.example + T To: deny_me@rwtest.example + I Message-Id: + F From: CALLER_NAME + 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 by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for r2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27074,9 +27073,9 @@ 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 -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: errorsto: orcpt: 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 <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -27134,7 +27133,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27174,7 +27173,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example in "^.{40,}@*"? @@ -27249,18 +27248,18 @@ remainder: lookup failed search_tidyup called >>Headers after rewriting and local additions: -* To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example -T To: deny_me@rwtest.example -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + * To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example + T To: deny_me@rwtest.example + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D -Data file written for message 10HmaZ-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D +Data file written for message 10HmaZ-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for r3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27270,9 +27269,9 @@ 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H +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 @@ -27330,7 +27329,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27370,11 +27369,11 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example LOG: MAIN - rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123... + qualify/rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123... rewrite_one_header: type=F: From: CALLER_NAME CALLER@myhost.test.ex in "^.{40,}@*"? @@ -27415,17 +27414,17 @@ LOG: MAIN lookup failed search_tidyup called >>Headers after rewriting and local additions: -T To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D -Data file written for message 10HmbA-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D +Data file written for message 10HmbA-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for r4@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27438,9 +27437,9 @@ 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H +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 @@ -27498,7 +27497,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27538,7 +27537,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: undisclosed recpients:; rewrite_one_header: type=F: @@ -27581,17 +27580,17 @@ rewrite headers lookup failed search_tidyup called >>Headers after rewriting and local additions: -T To: undisclosed recpients:; -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: undisclosed recpients:; + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbB-0005vi-00-D -Data file written for message 10HmbB-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbB-000000005vi-0000-D +Data file written for message 10HmbB-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for r5@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27601,9 +27600,9 @@ 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H +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 @@ -27661,7 +27660,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27701,11 +27700,11 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: fred@ LOG: MAIN - rewrite: domain missing or malformed + qualify/rewrite: domain missing or malformed rewrite_one_header: type=F: From: CALLER_NAME CALLER@myhost.test.ex in "^.{40,}@*"? @@ -27746,17 +27745,17 @@ LOG: MAIN lookup failed search_tidyup called >>Headers after rewriting and local additions: -T To: fred@ -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: fred@ + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbC-0005vi-00-D -Data file written for message 10HmbC-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbC-000000005vi-0000-D +Data file written for message 10HmbC-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for r6@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27769,9 +27768,9 @@ 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H +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