diff options
Diffstat (limited to 'test/stderr')
| -rw-r--r-- | test/stderr/0227 | 22 | ||||
| -rw-r--r-- | test/stderr/0376 | 18 | ||||
| -rw-r--r-- | test/stderr/0398 | 2 | ||||
| -rw-r--r-- | test/stderr/0432 | 2 | ||||
| -rw-r--r-- | test/stderr/0462 | 4 | ||||
| -rw-r--r-- | test/stderr/0473 | 4 | ||||
| -rw-r--r-- | test/stderr/5410 | 9 | ||||
| -rw-r--r-- | test/stderr/5420 | 9 | ||||
| -rw-r--r-- | test/stderr/5840 | 5 |
9 files changed, 38 insertions, 37 deletions
diff --git a/test/stderr/0227 b/test/stderr/0227 index 7fa279d38..6a8ee1f7e 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -31,7 +31,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: response to "RCPT TO:<bad@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown user + H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN @@ -50,7 +50,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: response to "RCPT TO:<uncheckable@localhost1>" from 127.0.0.1 [127.0.0.1] was: 450 Temporary error + H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN @@ -67,7 +67,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 Error for <> + H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <> LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN @@ -85,7 +85,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550-Multiline error for <>\n550 Here's the second line + H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN @@ -104,7 +104,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: response to "RCPT TO:<z@remote.domain>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked + H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -122,7 +122,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: response to "RCPT TO:<z@remote.domain>" 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=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 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 @@ -212,7 +212,7 @@ Cutthrough cancelled by presence of postmaster verify SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: response to "RCPT TO:<postmaster@localhost1>" from 127.0.0.1 [127.0.0.1] was: 550 Don't like postmaster + H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster LOG: MAIN REJECT H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed LOG: smtp_connection MAIN @@ -225,7 +225,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250- wotcher 250-SIZE 250 OK - SMTP>> MAIL FROM:<> + SMTP>> MAIL FROM:<> SIZE=ssss SMTP<< 250 OK SMTP>> RCPT TO:<ok@localhost1> SMTP<< 250 OK @@ -248,7 +248,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: response to "RCPT TO:<z@remote.lmtp>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked + H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -256,7 +256,7 @@ LOG: smtp_connection MAIN Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] Remote host closed connection in response to initial connection + H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN @@ -265,7 +265,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] could not connect: Connection refused + H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : could not connect: Connection refused LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN diff --git a/test/stderr/0376 b/test/stderr/0376 index 4ad0556b9..bcddefdfa 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -63,7 +63,7 @@ interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused connect: Connection refused LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] could not connect: Connection refused + H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : could not connect: Connection refused created log directory TESTSUITE/spool/log LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout @@ -99,7 +99,7 @@ wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 wrote negative callout cache address record for bad@localhost LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: response to "RCPT TO:<bad@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 REJECTED + H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN @@ -152,7 +152,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected wrote callout cache domain record for localhost: result=3 postmaster=0 random=0 LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 REJECT MAIL FROM + H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN @@ -214,7 +214,7 @@ wrote callout cache domain record for otherhost: result=1 postmaster=2 random=0 wrote positive callout cache address record for ok@otherhost LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: response to "RCPT TO:<postmaster@otherhost>" from 127.0.0.1 [127.0.0.1] was: 550 NOT OK + H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK LOG: MAIN REJECT H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN @@ -323,6 +323,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP(close)>> wrote callout cache domain record for otherhost3: result=1 postmaster=0 random=1 +LOG: MAIN REJECT + H=[V4NET.0.0.3] U=root sender verify defer for <ok@otherhost3>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : response to "RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost3>" was: 250 OK +LOG: MAIN REJECT + H=[V4NET.0.0.3] U=root F=<ok@otherhost3> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -369,6 +373,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP(close)>> wrote callout cache domain record for otherhost4: result=1 postmaster=0 random=1 +LOG: MAIN REJECT + H=[V4NET.0.0.4] U=root sender verify defer for <ok@otherhost4>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : response to "RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost4>" was: 250 OK +LOG: MAIN REJECT + H=[V4NET.0.0.4] U=root F=<ok@otherhost4> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -653,7 +661,7 @@ SMTP timeout wrote callout cache domain record for otherhost51: result=1 postmaster=0 random=0 LOG: MAIN REJECT - H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout + H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> LOG: MAIN REJECT H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN diff --git a/test/stderr/0398 b/test/stderr/0398 index cb1d4e58b..b975ad05a 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -163,7 +163,7 @@ closed hints database and lockfile l_message: $acl_verify_message warn: condition test succeeded in ACL "rcpt" LOG: MAIN - U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown + U=CALLER Warning: Sender verify failed: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<qq@remote>: 550 Unknown processing "accept" check senders = qq@remote address match test: subject=qq@remote pattern=qq@remote diff --git a/test/stderr/0432 b/test/stderr/0432 index 561e816b2..6ac5a0428 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -313,5 +313,5 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP timeout >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "mail" -LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] SMTP timeout after EHLO myhost.test.ex +LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout diff --git a/test/stderr/0462 b/test/stderr/0462 index 3db191cd9..072503e91 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -34,7 +34,7 @@ wrote callout cache domain record for localhost: result=1 postmaster=2 random=0 wrote positive callout cache address record for Ok@localhost LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: response to "RCPT TO:<postmaster@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 NO + H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO created log directory TESTSUITE/spool/log LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed @@ -78,7 +78,7 @@ wrote callout cache domain record for elsewhere: result=1 postmaster=0 random=0 wrote negative callout cache address record for NOTok@elsewhere LOG: MAIN REJECT - H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: response to "RCPT TO:<NOTok@elsewhere>" from 127.0.0.1 [127.0.0.1] was: 550 NO + H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO LOG: MAIN REJECT H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed LOG: smtp_connection MAIN diff --git a/test/stderr/0473 b/test/stderr/0473 index 048762f95..f1b03b8e2 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -24,7 +24,7 @@ SMTP timeout wrote callout cache domain record for two.test.ex: result=1 postmaster=0 random=0 LOG: MAIN REJECT - U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout + U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<r11@two.test.ex> LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -46,7 +46,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP(close)>> SMTP timeout LOG: MAIN REJECT - U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] SMTP timeout after initial connection + U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after initial connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5410 b/test/stderr/5410 index 2efd8419c..acfc011cc 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -120,10 +120,9 @@ using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss -cmd buf flush ddd bytes - SMTP<< 250 OK SMTP>> RCPT TO:<userx@domain.com> cmd buf flush ddd bytes + SMTP<< 250 OK SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -335,10 +334,9 @@ using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss -cmd buf flush ddd bytes - SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> cmd buf flush ddd bytes + SMTP<< 250 OK SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -550,10 +548,9 @@ using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss -cmd buf flush ddd bytes - SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> cmd buf flush ddd bytes + SMTP<< 250 OK SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ diff --git a/test/stderr/5420 b/test/stderr/5420 index eb3f1a9d2..ff032e986 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -119,10 +119,9 @@ using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss -cmd buf flush ddd bytes - SMTP<< 250 OK SMTP>> RCPT TO:<userx@domain.com> cmd buf flush ddd bytes + SMTP<< 250 OK SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -334,10 +333,9 @@ using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss -cmd buf flush ddd bytes - SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> cmd buf flush ddd bytes + SMTP<< 250 OK SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -549,10 +547,9 @@ using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss -cmd buf flush ddd bytes - SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> cmd buf flush ddd bytes + SMTP<< 250 OK SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ diff --git a/test/stderr/5840 b/test/stderr/5840 index b588681d3..e4cf15c51 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -54,10 +54,9 @@ MUNGED: ::1 will be omitted in what follows >>> ip4.ip4.ip4.ip4 in hosts_avoid_pipelining? no (option unset) >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset) >>> SMTP>> MAIL FROM:<> SIZE=ssss ->>> cmd buf flush 24 bytes ->>> SMTP<< 250 OK >>> SMTP>> RCPT TO:<rcptuser@dane256ee.test.ex> ->>> cmd buf flush 38 bytes +>>> cmd buf flush 62 bytes +>>> SMTP<< 250 OK >>> SMTP<< 250 Accepted >>> SMTP>> QUIT >>> cmd buf flush 6 bytes |