X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/30079bc1d20c0473d012ef33654358cfadb0a2ff..2685d6e0ddeef51a5aafe6544e3aa6c1dfc5035e:/test/stderr/0388 diff --git a/test/stderr/0388 b/test/stderr/0388 index daad8d113..67b47ab06 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -3,6 +3,8 @@ changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp configuration file is TESTSUITE/test-config admin user +DSN: r0 propagating DSN +DSN: r1 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 locking TESTSUITE/spool/db/retry.lockfile @@ -79,12 +81,11 @@ returned from EXIM_DBOPEN no retry data available 127.0.0.1 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (x@y) -Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex SMTP<< 250 OK -127.0.0.1 in hosts_avoid_pipelining? no (option unset) 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: SMTP<< 250 OK @@ -94,6 +95,7 @@ LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 SMTP>> QUIT + SMTP(close)>> set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for x@y: result OK address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") @@ -110,12 +112,12 @@ Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER -added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL: errno=dd more_errno=dd,A flags=2 +added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) search_tidyup called set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaX-0005vi-00 -reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL from subprocess +reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess added retry item reading retry information for R:x@y from subprocess added retry item @@ -147,14 +149,14 @@ dbfn_write: key=R:x@y address match test: subject=*@V4NET.0.0.0 pattern=* 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:1224/NULL (y) = * 0 0 -dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224/NULL +retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0 +dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 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:1224/NULL +Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224 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:1224/NULL +dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded @@ -168,6 +170,8 @@ trusted user admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp +DSN: r0 propagating DSN +DSN: r1 propagating DSN originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name= sender address = set_process_info: pppp accepting a local non-SMTP message from <> @@ -178,6 +182,8 @@ X-Failed-Recipients: x@y Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex +Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM +MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender rewrite_one_header: type=F: @@ -190,6 +196,8 @@ search_tidyup called Auto-Submitted: auto-replied F From: Mail Delivery System T To: CALLER@myhost.test.ex + 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 @@ -213,6 +221,8 @@ changed uid/gid: forcing real = effective configuration file is TESTSUITE/test-config trusted user admin user +DSN: r0 propagating DSN +DSN: r1 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 locking TESTSUITE/spool/db/retry.lockfile