From 02b41d7106c67bbe862d6a44373034684a03c00e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 24 Dec 2016 21:04:20 +0000 Subject: Use smtp_setup_conn() for verify callout --- test/stderr/0227 | 7 +++---- test/stderr/0376 | 2 +- test/stderr/0398 | 2 ++ test/stderr/0432 | 6 ++++-- test/stderr/0473 | 4 ++-- test/stderr/5410 | 15 ++++++++++++--- test/stderr/5420 | 15 ++++++++++++--- test/stderr/5840 | 9 +++++---- 8 files changed, 41 insertions(+), 19 deletions(-) (limited to 'test/stderr') diff --git a/test/stderr/0227 b/test/stderr/0227 index d676f05a7..7fa279d38 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -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 : response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 450 Temporary error + H=[V4NET.0.0.1] U=root sender verify defer for : Could not complete sender verify callout: response to "RCPT TO:" from 127.0.0.1 [127.0.0.1] was: 450 Temporary error LOG: MAIN REJECT H=[V4NET.0.0.1] U=root F= temporarily rejected RCPT : Could not complete sender verify callout LOG: smtp_connection MAIN @@ -254,10 +254,9 @@ LOG: smtp_connection MAIN LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected - SMTP>> QUIT SMTP(close)>> LOG: MAIN REJECT - H=[V4NET.0.0.1] U=root sender verify defer for : response to "initial connection" from 127.0.0.1 [127.0.0.1] was: connection dropped + H=[V4NET.0.0.1] U=root sender verify defer for : 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= temporarily rejected RCPT : Could not complete sender verify callout LOG: smtp_connection MAIN @@ -266,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 : could not connect to 127.0.0.1 [127.0.0.1]: Connection refused + H=[V4NET.0.0.1] U=root sender verify defer for : 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= temporarily rejected RCPT : Could not complete sender verify callout LOG: smtp_connection MAIN diff --git a/test/stderr/0376 b/test/stderr/0376 index 652477e75..4ad0556b9 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 : could not connect to 127.0.0.1 [127.0.0.1]: Connection refused + H=[V4NET.0.0.1] U=root sender verify defer for : 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= temporarily rejected RCPT : Could not complete sender verify callout diff --git a/test/stderr/0398 b/test/stderr/0398 index 7489a19a1..cb1d4e58b 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -135,6 +135,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> EHLO mail.test.ex cmd buf flush ddd bytes SMTP<< 250 OK +not using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<> cmd buf flush ddd bytes diff --git a/test/stderr/0432 b/test/stderr/0432 index f819fb0b2..561e816b2 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -96,6 +96,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes SMTP<< 250 OK +not using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<> cmd buf flush ddd bytes @@ -307,9 +309,9 @@ MUNGED: ::1 will be omitted in what follows >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex >>> cmd buf flush 21 bytes ->>> SMTP timeout >>> SMTP(close)>> +>>> SMTP timeout >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "mail" -LOG: H=[1.2.3.4] sender verify defer for : Could not complete sender verify callout +LOG: H=[1.2.3.4] sender verify defer for : 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 : Could not complete sender verify callout diff --git a/test/stderr/0473 b/test/stderr/0473 index ed7bc5359..048762f95 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -43,10 +43,10 @@ callout cache: found domain record for two.test.ex callout cache: no address record found for r11@two.test.ex interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected -SMTP timeout SMTP(close)>> +SMTP timeout LOG: MAIN REJECT - U=CALLER F= temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout + U=CALLER F= 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 cb1b31b72..2efd8419c 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -115,8 +115,11 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP +127.0.0.1 in hosts_avoid_pipelining? no (option unset) +using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SIZE=ssss cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: @@ -327,8 +330,11 @@ considering: *}{:}} expanding: ${if eq {$address_data}{usery}{*}{:}} result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") +127.0.0.1 in hosts_avoid_pipelining? no (option unset) +using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SIZE=ssss cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: @@ -539,8 +545,11 @@ considering: *}{:}} expanding: ${if eq {$address_data}{usery}{*}{:}} result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") +127.0.0.1 in hosts_avoid_pipelining? no (option unset) +using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SIZE=ssss cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: diff --git a/test/stderr/5420 b/test/stderr/5420 index 8ccf0fd6c..eb3f1a9d2 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -114,8 +114,11 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP +127.0.0.1 in hosts_avoid_pipelining? no (option unset) +using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SIZE=ssss cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: @@ -326,8 +329,11 @@ considering: *}{:}} expanding: ${if eq {$address_data}{usery}{*}{:}} result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") +127.0.0.1 in hosts_avoid_pipelining? no (option unset) +using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SIZE=ssss cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: @@ -538,8 +544,11 @@ considering: *}{:}} expanding: ${if eq {$address_data}{usery}{*}{:}} result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") +127.0.0.1 in hosts_avoid_pipelining? no (option unset) +using PIPELINING +not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SIZE=ssss cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: diff --git a/test/stderr/5840 b/test/stderr/5840 index 97fdca69d..b588681d3 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -20,12 +20,12 @@ >>> Attempting full verification using callout >>> callout cache: no domain record found for dane256ee.test.ex >>> callout cache: no address record found for rcptuser@dane256ee.test.ex ->>> interface=NULL port=1225 ->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected MUNGED: ::1 will be omitted in what follows >>> get[host|ipnode]byname[2] looked up these IP addresses: >>> name=thishost.test.ex address=127.0.0.1 >>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (end of list) +>>> interface=NULL port=1225 +>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex @@ -51,9 +51,10 @@ MUNGED: ::1 will be omitted in what follows >>> 250-8BITMIME >>> 250-PIPELINING >>> 250 HELP +>>> 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:<> ->>> cmd buf flush 14 bytes +>>> SMTP>> MAIL FROM:<> SIZE=ssss +>>> cmd buf flush 24 bytes >>> SMTP<< 250 OK >>> SMTP>> RCPT TO: >>> cmd buf flush 38 bytes -- cgit v1.2.3