X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/18eacc1185bea956bd9c793ab34e582c08941799..8748cff12e22ba27f9b52c87865e5d5a1340ec9e:/test/stderr/0388 diff --git a/test/stderr/0388 b/test/stderr/0388 index dd3dc3eec..c62492e6a 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -23,9 +23,9 @@ routing x@y --------> r0 router <-------- local_part=x domain=y checking local_parts -x in "CALLER"? +x in local_parts? list element: CALLER -x in "CALLER"? no (end of list) +x in local_parts? no (end of list) r0 router skipped: local_parts mismatch --------> r1 router <-------- local_part=x domain=y @@ -85,8 +85,9 @@ checking retry status of 127.0.0.1 no retry data available 127.0.0.1 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y) -Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen? - list element: +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... + 127.0.0.1 in hosts_try_fastopen? + list element: connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) @@ -108,7 +109,7 @@ cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250' set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK *@127.0.0.1 in "*"? list element: * @@ -127,16 +128,17 @@ checking retry status of V4NET.0.0.0 no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-000000005vi-0000 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... V4NET.0.0.0 in hosts_try_fastopen? - failed: Network Error +Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... + V4NET.0.0.0 in hosts_try_fastopen? + failed: Network Error LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER -added retry item for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,A flags=2 +added retry item for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,A flags=2 set_process_info: pppp delivering 10HmaX-000000005vi-0000: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaX-000000005vi-0000 (just run smtp for x@y in subprocess) search_tidyup called -reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S from subprocess +reading retry information for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S from subprocess added retry item reading retry information for R:x@y from subprocess added retry item @@ -177,14 +179,14 @@ Writing retry data for R:x@y list element: * V4NET.0.0.0 in "*"? yes (matched "*") *@V4NET.0.0.0 in "*"? yes (matched "*") -retry for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S (y) = * 0 0 - dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S +retry for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S (y) = * 0 0 + dbfn_read: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S failing_interval=ttt message_age=ttt on queue longer than maximum retry -Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S +Writing retry data for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S first failed=dddd last try=dddd next try=+0 expired=0 errno=dd more_errno=dd,A Network Error - dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S + dbfn_write: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded @@ -218,24 +220,24 @@ MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: Mail Delivery System rewrite_one_header: type=T: To: CALLER@myhost.test.ex search_tidyup called >>Headers after rewriting and local additions: - X-Failed-Recipients: x@y - Auto-Submitted: auto-replied -F From: Mail Delivery System -T To: CALLER@myhost.test.ex - References: - Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM - MIME-Version: 1.0 - Subject: Mail delivery failed: returning message to sender -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + X-Failed-Recipients: x@y + Auto-Submitted: auto-replied + F From: Mail Delivery System + T To: CALLER@myhost.test.ex + References: + Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM + MIME-Version: 1.0 + Subject: Mail delivery failed: returning message to sender + I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 @@ -281,14 +283,14 @@ routing CALLER@myhost.test.ex --------> r0 router <-------- local_part=CALLER domain=myhost.test.ex checking local_parts -CALLER in "CALLER"? +CALLER in local_parts? list element: CALLER - CALLER in "CALLER"? yes (matched "CALLER") + CALLER in local_parts? yes (matched "CALLER") checking senders - in ":"? + in senders? list element: address match test: subject= pattern= - in ":"? yes (matched "") + in senders? yes (matched "") calling r0 router rda_interpret (string): ':blackhole:' expanded: ':blackhole:'