From: Jeremy Harris Date: Tue, 1 May 2012 19:12:36 +0000 (+0100) Subject: Fixup testsuite cases affected by dual-tls - mainly EHLO on callouts. X-Git-Tag: exim-4_81_RC1~79 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cb9d95aeae369ae85cd13473cda0bb3ae415fcb9;p=exim.git Fixup testsuite cases affected by dual-tls - mainly EHLO on callouts. --- diff --git a/src/src/expand.c b/src/src/expand.c index 3fb431c2e..f3bd3f162 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -621,7 +621,7 @@ static var_entry var_table[] = { { "tls_sni", vtype_stringptr, &tls_in.sni }, #endif { "tls_out_bits", vtype_int, &tls_out.bits }, - { "tls_out_certificate_verified", vtype_int, &tls_out.certificate_verified }, + { "tls_out_certificate_verified", vtype_int,&tls_out.certificate_verified }, { "tls_out_cipher", vtype_stringptr, &tls_out.cipher }, { "tls_out_peerdn", vtype_stringptr, &tls_out.peerdn }, #if defined(SUPPORT_TLS) && !defined(USE_GNUTLS) diff --git a/test/log/5400 b/test/log/5400 index 6d38a372f..69f769cbd 100644 --- a/test/log/5400 +++ b/test/log/5400 @@ -1,3 +1,4 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp +1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227 index 62832e012..7b091de4b 100644 --- a/test/scripts/0000-Basic/0227 +++ b/test/scripts/0000-Basic/0227 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -24,7 +24,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -40,7 +40,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -56,7 +56,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 550 Error for <> @@ -70,7 +70,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 550-Multiline error for <> @@ -85,7 +85,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -101,7 +101,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -123,7 +123,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -142,7 +142,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -161,7 +161,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -183,7 +183,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0376 b/test/scripts/0000-Basic/0376 index 7430a6bce..6a819a6ae 100644 --- a/test/scripts/0000-Basic/0376 +++ b/test/scripts/0000-Basic/0376 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -33,7 +33,7 @@ QUIT # Test unsuccessful caching server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -55,7 +55,7 @@ QUIT # Test caching of rejection of MAIL FROM:<> server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 550 REJECT MAIL FROM @@ -75,7 +75,7 @@ QUIT # Test caching of rejection of postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -103,7 +103,7 @@ QUIT # Test caching of accepting of postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -131,7 +131,7 @@ QUIT # Test caching of accepting a random address server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -153,7 +153,7 @@ QUIT # Test caching of accepting a random address and postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -175,7 +175,7 @@ QUIT # Test caching of rejecting a random address and postmaster server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -210,7 +210,7 @@ QUIT # address has to be tested server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -232,7 +232,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -249,7 +249,7 @@ QUIT # Test caching of rejecting a random address server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -271,7 +271,7 @@ QUIT **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -289,7 +289,7 @@ QUIT sleep 2 server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -312,7 +312,7 @@ QUIT # Timeout on the RCPT for random server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -327,7 +327,7 @@ QUIT # Postmaster_sender set non-empty server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -350,7 +350,7 @@ QUIT # Header_sender sender set non-empty server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -370,7 +370,7 @@ QUIT # Timeout on RCPT for header_sender (defer_ok test) server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -388,7 +388,7 @@ QUIT # Test full postmaster check server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -413,7 +413,7 @@ QUIT # Test postmaster_mailfrom with random server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0398 b/test/scripts/0000-Basic/0398 index c98016a69..3465e26d6 100644 --- a/test/scripts/0000-Basic/0398 +++ b/test/scripts/0000-Basic/0398 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -22,7 +22,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -38,7 +38,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0413 b/test/scripts/0000-Basic/0413 index 583ea2ca5..eb805808e 100644 --- a/test/scripts/0000-Basic/0413 +++ b/test/scripts/0000-Basic/0413 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 3 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -13,7 +13,7 @@ QUIT 250 OK *eof 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -23,7 +23,7 @@ QUIT 250 OK *eof 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0432 b/test/scripts/0000-Basic/0432 index 4d9935317..e83626ca3 100644 --- a/test/scripts/0000-Basic/0432 +++ b/test/scripts/0000-Basic/0432 @@ -7,7 +7,7 @@ quit **** server PORT_S 220 server ready -HELO +EHLO 250 OK MAIL 250 OK @@ -30,7 +30,7 @@ quit **** server PORT_S 220 server ready -HELO +EHLO 250 OK MAIL 250 OK @@ -46,7 +46,7 @@ quit # Timeout stuff server PORT_S 220 server ready -HELO +EHLO *sleep 2 *eof **** diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462 index d12ced725..da7b714bf 100644 --- a/test/scripts/0000-Basic/0462 +++ b/test/scripts/0000-Basic/0462 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -27,7 +27,7 @@ QUIT # This one fails the actual address server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -44,7 +44,7 @@ QUIT # Same again, but with sender_verify_fail logging turned off server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0473 b/test/scripts/0000-Basic/0473 index 4624f5f01..3d17e5ed0 100644 --- a/test/scripts/0000-Basic/0473 +++ b/test/scripts/0000-Basic/0473 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 3 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -13,7 +13,7 @@ QUIT 250 OK *eof 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -23,7 +23,7 @@ QUIT 250 OK *eof 220 Server ready -HELO +EHLO 250 OK MAIL FROM 550 NOTOK @@ -51,7 +51,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -68,7 +68,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -85,7 +85,7 @@ quit **** server PORT_S 220 server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -109,7 +109,7 @@ quit **** server PORT_S 220 server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -134,7 +134,7 @@ quit **** server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK @@ -152,7 +152,7 @@ quit dump callout server PORT_S 220 Server ready -HELO +EHLO 250 OK MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0518 b/test/scripts/0000-Basic/0518 index 1a6da0129..6b092173c 100644 --- a/test/scripts/0000-Basic/0518 +++ b/test/scripts/0000-Basic/0518 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 8 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -13,7 +13,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -23,7 +23,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -33,7 +33,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -43,7 +43,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -53,7 +53,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -63,7 +63,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -73,7 +73,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK diff --git a/test/scripts/0000-Basic/0540 b/test/scripts/0000-Basic/0540 index 62bb4fbce..0866eefb9 100644 --- a/test/scripts/0000-Basic/0540 +++ b/test/scripts/0000-Basic/0540 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 4 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -13,7 +13,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -23,7 +23,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK @@ -33,7 +33,7 @@ QUIT 250 OK *eof 220 Welcome -HELO +EHLO 250 Hi MAIL FROM 250 OK diff --git a/test/scripts/2100-OpenSSL/2112 b/test/scripts/2100-OpenSSL/2112 index 4793929bc..1a39b4ecf 100644 --- a/test/scripts/2100-OpenSSL/2112 +++ b/test/scripts/2100-OpenSSL/2112 @@ -1,5 +1,5 @@ # TLS client: verify certificate from server - fails -exim -DSERVER=server -bd -oX PORT_D +exim -DSERVER=server -d+all -bd -oX PORT_D **** exim userx@test.ex Testing diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400 index 4aa332b86..843e24b30 100644 --- a/test/scripts/5400-cutthrough/5400 +++ b/test/scripts/5400-cutthrough/5400 @@ -3,7 +3,7 @@ need_ipv4 # server PORT_S 220 ESMTP -HELO +EHLO 250 OK MAIL FROM: 250 Sender OK @@ -28,7 +28,7 @@ QUIT # cutthrough cancelled by multiple recipients server PORT_S 2 220 ESMTP -HELO +EHLO 250 OK MAIL FROM: 250 Sender OK @@ -55,8 +55,8 @@ QUIT exim -d-all+acl+transport -bs EHLO myhost.test.ex MAIL FROM: -RCPT TO: RCPT TO: +RCPT TO: DATA . diff --git a/test/stderr/0227 b/test/stderr/0227 index 8a34bd454..31f5b584d 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -2,7 +2,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -19,7 +19,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -36,7 +36,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -53,7 +53,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 550 Error for <> @@ -68,7 +68,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 550-Multiline error for <> @@ -84,7 +84,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -99,7 +99,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -123,7 +123,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -138,7 +138,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -153,12 +153,13 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -174,12 +175,13 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> diff --git a/test/stderr/0376 b/test/stderr/0376 index 3a6367578..857295978 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -14,7 +14,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -83,7 +83,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -137,7 +137,7 @@ callout cache: address record expired interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 550 REJECT MAIL FROM @@ -187,12 +187,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -246,12 +247,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -299,7 +301,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -343,7 +345,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -387,7 +389,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -399,6 +401,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -447,12 +450,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -483,7 +487,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -512,7 +516,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -548,7 +552,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -577,7 +581,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -612,7 +616,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -643,12 +647,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM: @@ -679,7 +684,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 OK @@ -711,7 +716,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -740,12 +745,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -777,7 +783,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 OK @@ -789,6 +795,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM: diff --git a/test/stderr/0398 b/test/stderr/0398 index f02458c39..db5c4cf79 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -126,7 +126,8 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO mail.test.ex +127.0.0.1 in hosts_avoid_esmtp? no (option unset) + SMTP>> EHLO mail.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK diff --git a/test/stderr/0432 b/test/stderr/0432 index a35449b40..33e1b9892 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -89,7 +89,8 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 server ready - SMTP>> HELO myhost.test.ex +127.0.0.1 in hosts_avoid_esmtp? no (option unset) + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -242,7 +243,8 @@ MUNGED: ::1 will be omitted in what follows >>> interface=NULL port=1224 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready ->>> SMTP>> HELO myhost.test.ex +>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) +>>> SMTP>> EHLO myhost.test.ex >>> SMTP<< 250 OK >>> SMTP>> MAIL FROM:<> >>> SMTP<< 250 OK @@ -280,7 +282,8 @@ MUNGED: ::1 will be omitted in what follows >>> interface=NULL port=1224 >>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready ->>> SMTP>> HELO myhost.test.ex +>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) +>>> SMTP>> EHLO myhost.test.ex >>> SMTP timeout >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "mail" diff --git a/test/stderr/0462 b/test/stderr/0462 index 238959945..f9133d602 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -14,12 +14,13 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 OK +Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -62,7 +63,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK @@ -95,7 +96,7 @@ callout cache: no address record found interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> SMTP<< 250 OK diff --git a/test/stderr/5400 b/test/stderr/5400 index c8331e5da..c32d902b5 100644 --- a/test/stderr/5400 +++ b/test/stderr/5400 @@ -9,7 +9,7 @@ accept: condition test succeeded in inline ACL ----------- start cutthrough setup ------------ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 Sender OK @@ -20,12 +20,14 @@ processing "accept" accept: condition test succeeded in inline ACL SMTP>> DATA SMTP<< 354 Send data + SMTP>>(nl) SMTP>> . SMTP<< 250 OK ------------ cutthrough close ------------ LOG: MAIN - >> userx@domain.com R=all T=smtp + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] created log directory TESTSUITE/spool/log + SMTP>> QUIT +----------- cutthrough shutdown ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss LOG: MAIN @@ -44,11 +46,11 @@ accept: condition test succeeded in inline ACL ----------- start cutthrough setup ------------ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 Sender OK - SMTP>> RCPT TO: + SMTP>> RCPT TO: SMTP<< 250 Recipient OK ----------- end cutthrough setup ------------ processing "accept" @@ -66,13 +68,13 @@ configuration file is TESTSUITE/test-config trusted user admin user >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> ---------> userx@domain.com <-------- +--------> usery@domain.com <-------- smtp transport entered - userx@domain.com usery@domain.com + userz@domain.com checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 status = usable -delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com, ...) +delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (usery@domain.com, ...) Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex @@ -80,10 +82,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected not using PIPELINING SMTP>> MAIL FROM: SMTP<< 250 Sender OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK SMTP>> RCPT TO: SMTP<< 250 Recipient OK + SMTP>> RCPT TO: + SMTP<< 250 Recipient OK SMTP>> DATA SMTP<< 354 Send data SMTP>> writing message and terminating "." @@ -95,10 +97,3 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 SMTP>> QUIT Leaving smtp transport -LOG: MAIN - => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] -LOG: MAIN - -> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stdout/0227 b/test/stdout/0227 index 3682f296c..46057c824 100644 --- a/test/stdout/0227 +++ b/test/stdout/0227 @@ -96,7 +96,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -108,7 +108,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -120,7 +120,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -132,7 +132,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 550 Error for <> @@ -142,7 +142,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 550-Multiline error for <> @@ -153,7 +153,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -165,7 +165,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -178,7 +178,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -190,7 +190,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -202,7 +202,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -220,7 +220,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK diff --git a/test/stdout/0376 b/test/stdout/0376 index 342a94ed4..a0af2cb92 100644 --- a/test/stdout/0376 +++ b/test/stdout/0376 @@ -153,7 +153,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -165,7 +165,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -177,7 +177,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 550 REJECT MAIL FROM @@ -187,7 +187,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -205,7 +205,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -223,7 +223,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -235,7 +235,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -247,7 +247,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -271,7 +271,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -289,7 +289,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -301,7 +301,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -319,7 +319,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -331,7 +331,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -349,7 +349,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -359,7 +359,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -377,7 +377,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM: 250 OK @@ -389,7 +389,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -399,7 +399,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -419,7 +419,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM: 250 OK diff --git a/test/stdout/0398 b/test/stdout/0398 index f65d493b4..882015d49 100644 --- a/test/stdout/0398 +++ b/test/stdout/0398 @@ -27,7 +27,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO mail.test.ex +EHLO mail.test.ex 250 OK MAIL FROM:<> 250 OK @@ -39,7 +39,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO mail.test.ex +EHLO mail.test.ex 250 OK MAIL FROM:<> 250 OK @@ -51,7 +51,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO mail.test.ex +EHLO mail.test.ex 250 OK MAIL FROM:<> 250 OK diff --git a/test/stdout/0413 b/test/stdout/0413 index 18da4529a..5c320fc94 100644 --- a/test/stdout/0413 +++ b/test/stdout/0413 @@ -10,7 +10,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO mail.test.ex +EHLO mail.test.ex 250 OK MAIL FROM:<> 250 OK @@ -22,7 +22,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [ip4.ip4.ip4.ip4] 220 Server ready -HELO mail.test.ex +EHLO mail.test.ex 250 OK MAIL FROM:<> 250 OK @@ -34,7 +34,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO mail.test.ex +EHLO mail.test.ex 250 OK MAIL FROM:<> 250 OK diff --git a/test/stdout/0432 b/test/stdout/0432 index d6ac41709..e36d048a3 100644 --- a/test/stdout/0432 +++ b/test/stdout/0432 @@ -51,7 +51,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -63,7 +63,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -75,7 +75,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 server ready -HELO myhost.test.ex +EHLO myhost.test.ex *sleep 2 Expected EOF read from client End of script diff --git a/test/stdout/0462 b/test/stdout/0462 index 004a788af..585e2e08f 100644 --- a/test/stdout/0462 +++ b/test/stdout/0462 @@ -31,7 +31,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -49,7 +49,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK @@ -61,7 +61,7 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM:<> 250 OK diff --git a/test/stdout/0518 b/test/stdout/0518 index e94f8aa09..478b304b4 100644 --- a/test/stdout/0518 +++ b/test/stdout/0518 @@ -14,7 +14,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -26,7 +26,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -38,7 +38,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -50,7 +50,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -62,7 +62,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -74,7 +74,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -86,7 +86,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -98,7 +98,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK diff --git a/test/stdout/0540 b/test/stdout/0540 index 935f990f1..4d788a5e9 100644 --- a/test/stdout/0540 +++ b/test/stdout/0540 @@ -10,7 +10,7 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO localhost +EHLO localhost 250 Hi MAIL FROM:<> 250 OK @@ -22,7 +22,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO aname +EHLO aname 250 Hi MAIL FROM:<> 250 OK @@ -34,7 +34,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK @@ -46,7 +46,7 @@ Expected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Welcome -HELO myhost.test.ex +EHLO myhost.test.ex 250 Hi MAIL FROM:<> 250 OK diff --git a/test/stdout/5400 b/test/stdout/5400 index a6c813be3..3e53b4fe3 100644 --- a/test/stdout/5400 +++ b/test/stdout/5400 @@ -24,7 +24,7 @@ Listening on port 1224 ... Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM: 250 Sender OK @@ -43,15 +43,17 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK -Unexpected EOF read from client +QUIT +250 OK +End of script Listening on port 1224 ... Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP -HELO myhost.test.ex +EHLO myhost.test.ex 250 OK MAIL FROM: 250 Sender OK -RCPT TO: +RCPT TO: 250 Recipient OK QUIT Expected EOF read from client @@ -62,10 +64,10 @@ EHLO myhost.test.ex 250 OK MAIL FROM: 250 Sender OK -RCPT TO: -250 Recipient OK RCPT TO: 250 Recipient OK +RCPT TO: +250 Recipient OK DATA 354 Send data Received: from CALLER (helo=myhost.test.ex)