From 181d9bf8a602a2573d566427803a4c5288a56008 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 6 Oct 2012 23:20:08 +0100 Subject: Add $router_name and $transport_name variables. Bug 308. --- test/stderr/0143 | 7 ++++--- test/stderr/0227 | 32 +++++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 12 deletions(-) (limited to 'test/stderr') diff --git a/test/stderr/0143 b/test/stderr/0143 index 3373ded2e..bcf7ecc82 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -10,7 +10,8 @@ trusted user admin user >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@domain.com <-------- -smtp transport entered +transport_name from router +my_smtp transport entered userx@domain.com checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 status = usable @@ -36,9 +37,9 @@ transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 SMTP>> QUIT -Leaving smtp transport +Leaving my_smtp transport LOG: MAIN - => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" + => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0227 b/test/stderr/0227 index 31f5b584d..2530d7cd7 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -9,10 +9,18 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT +LOG: MAIN + verify recipient used R:all +LOG: MAIN + verify sender used R:all LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root +LOG: MAIN + verify recipient used R: +LOG: MAIN + verify sender used R:all LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -29,7 +37,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for : response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 Unknown user LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F= rejected RCPT : Sender verify failed + H=[V4NET.0.0.1] U=root F= rejected RCPT : (recipient) R:all: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -61,7 +69,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for : response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 Error for <> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F= rejected RCPT : Sender verify failed + H=[V4NET.0.0.1] U=root F= rejected RCPT : (mail) R:localhost1: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -77,7 +85,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for : response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550-Multiline error for <>\n550 Here's the second line LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root F= rejected RCPT : Sender verify failed + H=[V4NET.0.0.1] U=root F= rejected RCPT : (mail) R:localhost1: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -92,7 +100,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550 Recipient not liked SMTP>> QUIT LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F= rejected RCPT : (recipient): response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked + H=[V4NET.0.0.3] U=root F= rejected RCPT : (recipient) R:all: response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -108,7 +116,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected 550 Here's the second SMTP>> QUIT LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F= rejected RCPT : (recipient): response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second + H=[V4NET.0.0.3] U=root F= rejected RCPT : (recipient) R:all: response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -131,7 +139,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550 Not liked SMTP>> QUIT LOG: MAIN REJECT - H=[V4NET.0.0.4] U=root F= rejected after DATA: there is no valid sender in any header line + H=[V4NET.0.0.4] U=root F= rejected after DATA: header_sender R:all: there is no valid sender in any header line LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -146,11 +154,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550 Not liked SMTP>> QUIT LOG: MAIN REJECT - H=[V4NET.0.0.4] U=root F= rejected after DATA: there is no valid sender in any header line + H=[V4NET.0.0.4] U=root F= rejected after DATA: header_sender R:all: there is no valid sender in any header line LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root +LOG: MAIN + verify recipient used R: Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -167,12 +177,16 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO: SMTP<< 250 OK SMTP>> QUIT +LOG: MAIN + verify sender used R:localhost1 LOG: MAIN REJECT H=[V4NET.0.0.5] U=root F= rejected RCPT : relay not permitted LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root +LOG: MAIN + verify recipient used R: Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -192,7 +206,7 @@ Cutthrough cancelled by presence of postmaster verify LOG: MAIN REJECT H=[V4NET.0.0.5] U=root sender verify fail for : response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 Don't like postmaster LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root F= rejected RCPT : (postmaster): Sender verify failed + H=[V4NET.0.0.5] U=root F= rejected RCPT : (postmaster) R:localhost1: Sender verify failed LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -207,7 +221,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550 Recipient not liked SMTP>> QUIT LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F= rejected RCPT : (recipient): response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked + H=[V4NET.0.0.3] U=root F= rejected RCPT : (recipient) R:lmtp: response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN -- cgit v1.2.3