X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/b3f43fa01b5b8511bf22ff4781e6194cf2a5ab54..fdd3478e184a82c862b32e06aa812f94f06768f7:/test/stderr/0388?ds=sidebyside diff --git a/test/stderr/0388 b/test/stderr/0388 index f7855826f..e9e8c7b5c 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 @@ -91,11 +93,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 451 Temporary error LOG: MAIN - SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + 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 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: subject=*@127.0.0.1 pattern=* +address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") *@127.0.0.1 in "*"? yes (matched "*") checking status of V4NET.0.0.0 @@ -108,7 +110,7 @@ V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y) Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error LOG: MAIN - V4NET.0.0.0 [V4NET.0.0.0] Network Error + 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: errno=dd more_errno=dd,A flags=2 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) @@ -120,7 +122,7 @@ reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess reading retry information for R:x@y from subprocess added retry item LOG: MAIN - == x@y R=r1 T=smtp defer (dd): Network Error + == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1] changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=pppp set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 @@ -134,7 +136,7 @@ locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR -address match: subject=x@y pattern=* +address match test: subject=x@y pattern=* y in "*"? yes (matched "*") x@y in "*"? yes (matched "*") retry for R:x@y = * 0 0 @@ -142,9 +144,9 @@ dbfn_read: key=R:x@y failing_interval=ttt message_age=ttt Writing retry data for R:x@y first failed=dddd last try=dddd next try=+1 expired=1 - errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error dbfn_write: key=R:x@y -address match: subject=*@V4NET.0.0.0 pattern=* +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 (y) = * 0 0 @@ -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 @@ -236,7 +246,7 @@ local_part=CALLER domain=myhost.test.ex checking local_parts CALLER in "CALLER"? yes (matched "CALLER") checking senders -address match: subject= pattern= +address match test: subject= pattern= in ":"? yes (matched "") calling r0 router rda_interpret (string): :blackhole: