From: Jeremy Harris Date: Tue, 9 Aug 2016 22:32:46 +0000 (+0100) Subject: Testsuite: nail down hostname for CHUNKING test cases X-Git-Tag: exim-4_88_RC1~40 X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/c7cb9a4ad23afdf5998b68edb752ed310f9cb947 Testsuite: nail down hostname for CHUNKING test cases --- diff --git a/test/confs/0900 b/test/confs/0900 index 52678e45d..4c5824545 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -17,6 +17,7 @@ tls_advertise_hosts = ${if eq {Y}{tls} {*}} # ----- Main settings ----- +primary_hostname = testhost.test.ex domainlist local_domains = @ : test.ex acl_smtp_rcpt = check_recipient diff --git a/test/log/0900 b/test/log/0900 index 63072b9a9..32aeaca60 100644 --- a/test/log/0900 +++ b/test/log/0900 @@ -1,10 +1,10 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@the.local.host.name -1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@the.local.host.name -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@the.local.host.name +1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 SMTP data timeout (message abandoned) on connection from (tester) [127.0.0.1] F= 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data -1999-03-02 09:44:33 10HmbB-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@the.local.host.name +1999-03-02 09:44:33 10HmbB-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex diff --git a/test/log/0901 b/test/log/0901 index 0239bac64..c8f5d533e 100644 --- a/test/log/0901 +++ b/test/log/0901 @@ -1,38 +1,38 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for a@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for a@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for b@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 == b@test.ex R=to_server T=remote_smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after end of data (ddd bytes written) -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for c@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for c@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for d@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for d@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 ** d@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 500 oops 1999-03-02 09:44:33 10HmbA-0005vi-00 d@test.ex: error ignored 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for e@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for e@test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 == e@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 400 not right now -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for p@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for p@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => p@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for q@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for q@test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 == q@test.ex R=to_server T=remote_smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined end of data (ddd bytes written) -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for r@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for r@test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => r@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for s@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for s@test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 ** s@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 unacceptable mail-from 1999-03-02 09:44:33 10HmbF-0005vi-00 s@test.ex: error ignored 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for s1@test.ex +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for s1@test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 == s1@test.ex R=to_server T=remote_smtp defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from -1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for t@test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for t@test.ex 1999-03-02 09:44:33 10HmbH-0005vi-00 ** t@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 no such recipient 1999-03-02 09:44:33 10HmbH-0005vi-00 t@test.ex: error ignored 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for u@test.ex +1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for u@test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 ** u@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 500 oops bdat 1999-03-02 09:44:33 10HmbI-0005vi-00 u@test.ex: error ignored 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for v@test.ex +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for v@test.ex 1999-03-02 09:44:33 10HmbJ-0005vi-00 == v@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat diff --git a/test/log/0902 b/test/log/0902 index 24eb7a951..8d39088c6 100644 --- a/test/log/0902 +++ b/test/log/0902 @@ -1,34 +1,34 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for a@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for a@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for d@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for d@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 ** d@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after sending data block: 500 oops bdat-nonlast 1999-03-02 09:44:33 10HmaY-0005vi-00 d@test.ex: error ignored 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for p@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for p@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => p@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for s@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for s@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 ** s@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined sending data block: 550 unacceptable mail-from 1999-03-02 09:44:33 10HmbA-0005vi-00 s@test.ex: error ignored 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for t@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for t@test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 ** t@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 no such recipient 1999-03-02 09:44:33 10HmbB-0005vi-00 t@test.ex: error ignored 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for t1@test.ex t2@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for t1@test.ex t2@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 ** t1@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 no such recipient 1999-03-02 09:44:33 10HmbC-0005vi-00 => t2@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" 1999-03-02 09:44:33 10HmbC-0005vi-00 t1@test.ex: error ignored 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for u@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for u@test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 ** u@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined sending data block: 500 oops nonlast bdat 1999-03-02 09:44:33 10HmbD-0005vi-00 u@test.ex: error ignored 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for v@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for v@test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 ** v@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 500 oops bdat 1999-03-02 09:44:33 10HmbE-0005vi-00 v@test.ex: error ignored 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for p@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for p@test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 => p@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed diff --git a/test/log/2090 b/test/log/2090 index 630d2c6a4..d7415d972 100644 --- a/test/log/2090 +++ b/test/log/2090 @@ -1,5 +1,5 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss for CALLER@the.local.host.name -1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss for CALLER@the.local.host.name +1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss for CALLER@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss for CALLER@test.ex diff --git a/test/log/2091 b/test/log/2091 index 62238f82a..c1ae955a8 100644 --- a/test/log/2091 +++ b/test/log/2091 @@ -1,7 +1,7 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for CALLER@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K C="250- 340 byte chunk, total 340\\n250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for CALLER@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K C="250- 360 byte chunk, total 360\\n250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1224 -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (the.local.host.name) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss id=E10HmaX-0005vi-00@the.local.host.name for CALLER@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for CALLER@test.ex diff --git a/test/log/2190 b/test/log/2190 index 356a4ad92..11ff67ddb 100644 --- a/test/log/2190 +++ b/test/log/2190 @@ -1,5 +1,5 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no K S=sss for CALLER@the.local.host.name -1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no K S=sss for CALLER@the.local.host.name +1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no K S=sss for CALLER@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no K S=sss for CALLER@test.ex diff --git a/test/log/2191 b/test/log/2191 index 38418fb32..3d414f6e7 100644 --- a/test/log/2191 +++ b/test/log/2191 @@ -1,9 +1,9 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for CALLER@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for CALLER@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: "/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" -1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no K C="250- 340 byte chunk, total 340\\n250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no K C="250- 360 byte chunk, total 360\\n250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1224 -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (the.local.host.name) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no K S=sss id=E10HmaX-0005vi-00@the.local.host.name for CALLER@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for CALLER@test.ex diff --git a/test/log/4509 b/test/log/4509 index e2d3bc714..755a1ec4e 100644 --- a/test/log/4509 +++ b/test/log/4509 @@ -1,13 +1,13 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for a@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 973 byte chunk, total 973\\n250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for a@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 988 byte chunk, total 988\\n250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for b@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8509 byte chunk, total 9160\\n250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8524 byte chunk, total 9175\\n250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1224 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (the.local.host.name) [127.0.0.1] P=esmtp K S=sss id=E10HmaX-0005vi-00@the.local.host.name for a@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for a@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (the.local.host.name) [127.0.0.1] P=esmtp K S=sss id=E10HmaZ-0005vi-00@the.local.host.name for b@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss id=E10HmaZ-0005vi-00@testhost.test.ex for b@test.ex diff --git a/test/log/5591 b/test/log/5591 index b216ad9ef..395ffae3c 100644 --- a/test/log/5591 +++ b/test/log/5591 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= sender_gets_replaced@the.local.host.name U=CALLER P=local S=sss for usery userz -1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@the.local.host.name R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] PRDR K C="250 first rcpt was good" -1999-03-02 09:44:33 10HmaX-0005vi-00 -> userz@the.local.host.name R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] PRDR K C="250 second rcpt was good" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= sender_gets_replaced@testhost.test.ex U=CALLER P=local S=sss for usery userz +1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@testhost.test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] PRDR K C="250 first rcpt was good" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> userz@testhost.test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] PRDR K C="250 second rcpt was good" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/runtest b/test/runtest index 713c467d1..d9005e83d 100755 --- a/test/runtest +++ b/test/runtest @@ -867,9 +867,6 @@ RESET_AFTER_EXTRA_LINE_READ: # gnutls version variances next if /^Error in the pull function./; - - # Sizes vary with test hostname - s/^BDAT \d+/BDAT ddd/; } # ======== stderr ======== diff --git a/test/scripts/0000-Basic/0900 b/test/scripts/0000-Basic/0900 index 435906d60..9774e5747 100644 --- a/test/scripts/0000-Basic/0900 +++ b/test/scripts/0000-Basic/0900 @@ -14,7 +14,7 @@ ehlo tester ??? 250 HELP mail from:someone@some.domain ??? 250 -rcpt to:CALLER@HOSTNAME +rcpt to:CALLER@test.ex ??? 250 bdat 88 last To: Susan@random.com @@ -41,7 +41,7 @@ ehlo tester ??? 250 mail from:someone@some.domain ??? 250 -rcpt to:CALLER@HOSTNAME +rcpt to:CALLER@test.ex ??? 250 bdat 100 To: Susan@random.com @@ -57,7 +57,7 @@ bdat 0 last ??? 250 mail from:someone@some.domain ??? 250 -rcpt to:CALLER@HOSTNAME +rcpt to:CALLER@test.ex ??? 250 bdat 10 To: Susan@bdat 78 last @@ -85,7 +85,7 @@ ehlo tester ??? 250 mail from:someone@some.domain ??? 250 -rcpt to:CALLER@HOSTNAME +rcpt to:CALLER@test.ex ??? 250 bdat 89 last To: Susan@random.com @@ -108,7 +108,7 @@ ehlo tester ??? 250 mail from:someone@some.domain ??? 250 -rcpt to:CALLER@HOSTNAME +rcpt to:CALLER@test.ex ??? 250 bdat 88 To: Susan@random.com @@ -134,7 +134,7 @@ ehlo tester ??? 250 mail from:someone@some.domain ??? 250 -rcpt to:CALLER@HOSTNAME +rcpt to:CALLER@test.ex ??? 250 bdat 88 To: Susan@random.com @@ -155,7 +155,7 @@ EHLO tester ??? 250 mail from:someone@some.domain ??? 250 -rcpt to:CALLER@HOSTNAME +rcpt to:CALLER@test.ex ??? 250 bdat 88 To: Susan@random.com @@ -182,7 +182,7 @@ EHLO tester ??? 250-PIPELINING ??? 250-CHUNKING ??? 250 HELP -MAIL FROM:\r\nRCPT TO:\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n +MAIL FROM:\r\nRCPT TO:\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n ??? 250 ??? 250 ??? 250- diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901 index 7b0172a59..fef95ba6e 100644 --- a/test/scripts/0000-Basic/0901 +++ b/test/scripts/0000-Basic/0901 @@ -12,8 +12,8 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 250 OK QUIT 225 OK @@ -35,8 +35,8 @@ MAIL FROM 250 good mail cmd RCPT TO 250 acceptable rcpt cmd -BDAT 323 LAST -*data 324 +BDAT 343 LAST +*data 344 250 OK got that data QUIT 225 OK quitting @@ -59,8 +59,8 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 323 LAST -*data 322 +BDAT 343 LAST +*data 342 250 OK QUIT 225 OK @@ -81,8 +81,8 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 500 oops QUIT 225 OK @@ -103,8 +103,8 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 400 not right now QUIT 225 OK @@ -129,8 +129,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 250 OK mail 250 OK rcpt 250 OK bdat @@ -153,8 +153,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 323 LAST -*data 324 +BDAT 343 LAST +*data 344 250 good mail cmd **** exim -odf q@test.ex @@ -174,8 +174,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 323 LAST -*data 322 +BDAT 343 LAST +*data 342 250 OK mail 250 OK rcpt 250 OK bdat @@ -199,8 +199,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -222,8 +222,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 324 LAST -*data 324 +BDAT 344 LAST +*data 344 450 greylisted mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -245,8 +245,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 250 OK mail 550 no such recipient 500 oops bdat @@ -268,8 +268,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 250 OK mail 250 OK rcpt 500 oops bdat @@ -291,8 +291,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 323 LAST -*data 323 +BDAT 343 LAST +*data 343 250 OK mail 250 OK rcpt 400 not right now bdat diff --git a/test/scripts/0000-Basic/0902 b/test/scripts/0000-Basic/0902 index 9c719e1d1..eb262ee38 100644 --- a/test/scripts/0000-Basic/0902 +++ b/test/scripts/0000-Basic/0902 @@ -12,8 +12,8 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 317 -*data 317 +BDAT 337 +*data 337 250 OK nonlast bdat BDAT 8380 LAST *data 8380 @@ -128,8 +128,8 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 317 -*data 317 +BDAT 337 +*data 337 500 oops bdat-nonlast QUIT 225 OK @@ -243,10 +243,10 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 317 +BDAT 337 250 OK mail 250 OK rcpt -*data 317 +*data 337 250 OK nonlast bdat BDAT 8380 LAST *data 8380 @@ -362,8 +362,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 317 -*data 317 +BDAT 337 +*data 337 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat (nonlast) ungood lacking mail-from @@ -474,8 +474,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 317 -*data 317 +BDAT 337 +*data 337 250 OK mail 550 no such recipient 500 oops nonlast bdat - no rcpt @@ -587,8 +587,8 @@ EHLO MAIL FROM RCPT TO RCPT TO -BDAT 301 -*data 301 +BDAT 321 +*data 321 250 OK mail 550 no such recipient 250 good recipient @@ -703,8 +703,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 317 -*data 317 +BDAT 337 +*data 337 250 OK mail 250 OK rcpt 500 oops nonlast bdat @@ -815,8 +815,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 317 -*data 317 +BDAT 337 +*data 337 250 OK mail 250 OK rcpt 250 OK nonlast bdat @@ -935,8 +935,8 @@ BDAT 8191 250 OK rcpt *data 8191 250 OK nonlast bdat -BDAT 829 LAST -*data 829 +BDAT 849 LAST +*data 849 250 OK bdat QUIT 225 OK diff --git a/test/scripts/2000-GnuTLS/2090 b/test/scripts/2000-GnuTLS/2090 index f799016f1..55dc1fae9 100644 --- a/test/scripts/2000-GnuTLS/2090 +++ b/test/scripts/2000-GnuTLS/2090 @@ -25,7 +25,7 @@ EHLO rhu.barb ??? 250 HELP MAIL FROM: ??? 250 -RCPT TO: +RCPT TO: ??? 250 BDAT 88 LAST To: Susan@random.com @@ -59,7 +59,7 @@ EHLO rhu.barb ??? 250-CHUNKING ??? 250 HELP MAIL FROM: -RCPT TO: +RCPT TO: BDAT 88 LAST To: Susan@random.com From: Sam@random.com diff --git a/test/scripts/2100-OpenSSL/2190 b/test/scripts/2100-OpenSSL/2190 index bacca676d..708a36e71 100644 --- a/test/scripts/2100-OpenSSL/2190 +++ b/test/scripts/2100-OpenSSL/2190 @@ -24,7 +24,7 @@ EHLO rhu.barb ??? 250 HELP MAIL FROM: ??? 250 -RCPT TO: +RCPT TO: ??? 250 BDAT 88 LAST To: Susan@random.com @@ -58,7 +58,7 @@ EHLO rhu.barb ??? 250-CHUNKING ??? 250 HELP MAIL FROM: -RCPT TO: +RCPT TO: BDAT 88 LAST To: Susan@random.com From: Sam@random.com diff --git a/test/scripts/5500-PRDR/5591 b/test/scripts/5500-PRDR/5591 index 67b9de298..1ed52896f 100644 --- a/test/scripts/5500-PRDR/5591 +++ b/test/scripts/5500-PRDR/5591 @@ -16,8 +16,8 @@ RCPT TO 250 OK RCPT TO 250 OK -BDAT 317 LAST -*data 317 +BDAT 337 LAST +*data 337 353 prdr responses coming up 250 first rcpt was good 250 second rcpt was good diff --git a/test/stdout/0900 b/test/stdout/0900 index 28f479c22..bf6010f82 100644 --- a/test/stdout/0900 +++ b/test/stdout/0900 @@ -1,9 +1,9 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo tester ??? 250- -<<< 250-the.local.host.name Hello tester [127.0.0.1] +<<< 250-testhost.test.ex Hello tester [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -17,7 +17,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> mail from:someone@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@the.local.host.name +>>> rcpt to:CALLER@test.ex ??? 250 <<< 250 Accepted >>> bdat 88 last @@ -31,14 +31,14 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250 OK id=10HmaX-0005vi-00 >>> quit ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo tester ??? 250- -<<< 250-the.local.host.name Hello tester [127.0.0.1] +<<< 250-testhost.test.ex Hello tester [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -52,7 +52,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> mail from:someone@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@the.local.host.name +>>> rcpt to:CALLER@test.ex ??? 250 <<< 250 Accepted >>> bdat 100 @@ -74,7 +74,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> mail from:someone@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@the.local.host.name +>>> rcpt to:CALLER@test.ex ??? 250 <<< 250 Accepted >>> bdat 10 @@ -91,14 +91,14 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250 OK id=10HmaZ-0005vi-00 >>> quit ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo tester ??? 250- -<<< 250-the.local.host.name Hello tester [127.0.0.1] +<<< 250-testhost.test.ex Hello tester [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -112,7 +112,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> mail from:someone@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@the.local.host.name +>>> rcpt to:CALLER@test.ex ??? 250 <<< 250 Accepted >>> bdat 89 last @@ -121,14 +121,14 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Subject: This is a bodyless test message >>> ??? 421 -<<< 421 the.local.host.name SMTP incoming data timeout - closing connection. +<<< 421 testhost.test.ex SMTP incoming data timeout - closing connection. End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo tester ??? 250- -<<< 250-the.local.host.name Hello tester [127.0.0.1] +<<< 250-testhost.test.ex Hello tester [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -142,7 +142,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> mail from:someone@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@the.local.host.name +>>> rcpt to:CALLER@test.ex ??? 250 <<< 250 Accepted >>> bdat 88 @@ -157,14 +157,14 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 504 zero size for BDAT command >>> quit ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo tester ??? 250- -<<< 250-the.local.host.name Hello tester [127.0.0.1] +<<< 250-testhost.test.ex Hello tester [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -178,7 +178,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> mail from:someone@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@the.local.host.name +>>> rcpt to:CALLER@test.ex ??? 250 <<< 250 Accepted >>> bdat 88 @@ -196,7 +196,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250 Reset OK >>> EHLO tester ??? 250- -<<< 250-the.local.host.name Hello tester [127.0.0.1] +<<< 250-testhost.test.ex Hello tester [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -210,7 +210,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> mail from:someone@some.domain ??? 250 <<< 250 OK ->>> rcpt to:CALLER@the.local.host.name +>>> rcpt to:CALLER@test.ex ??? 250 <<< 250 Accepted >>> bdat 88 @@ -228,14 +228,14 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 503 only RSET accepted now >>> quit ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> EHLO tester ??? 250- -<<< 250-the.local.host.name Hello tester [127.0.0.1] +<<< 250-testhost.test.ex Hello tester [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -246,7 +246,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250-CHUNKING ??? 250 HELP <<< 250 HELP ->>> MAIL FROM:\r\nRCPT TO:\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n +>>> MAIL FROM:\r\nRCPT TO:\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n ??? 250 <<< 250 OK ??? 250 @@ -257,5 +257,5 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 250 OK id=10HmbB-0005vi-00 >>> quit ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script diff --git a/test/stdout/0901 b/test/stdout/0901 index c1b40a430..88f2c40de 100644 --- a/test/stdout/0901 +++ b/test/stdout/0901 @@ -3,14 +3,14 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250 CHUNKING MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT ddd LAST +BDAT 343 LAST 250 OK QUIT 225 OK @@ -19,26 +19,26 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250 CHUNKING MAIL FROM:<> 250 good mail cmd RCPT TO: 250 acceptable rcpt cmd -BDAT ddd LAST +BDAT 343 LAST Unxpected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250 CHUNKING MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT ddd LAST +BDAT 343 LAST 250 OK Comparison failed - bailing out @@ -46,14 +46,14 @@ Expected: QUIT Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250 CHUNKING MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT ddd LAST +BDAT 343 LAST 500 oops QUIT 225 OK @@ -61,14 +61,14 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250 CHUNKING MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT ddd LAST +BDAT 343 LAST 400 not right now QUIT 225 OK @@ -76,13 +76,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 343 LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -93,24 +93,24 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 343 LAST Unxpected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 343 LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -120,13 +120,13 @@ Expected: QUIT Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 343 LAST 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -136,13 +136,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 344 LAST 450 greylisted mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -152,13 +152,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 343 LAST 250 OK mail 550 no such recipient 500 oops bdat @@ -168,13 +168,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 343 LAST 250 OK mail 250 OK rcpt 500 oops bdat @@ -184,13 +184,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd LAST +BDAT 343 LAST 250 OK mail 250 OK rcpt 400 not right now bdat diff --git a/test/stdout/0902 b/test/stdout/0902 index 2c3a25381..5ab9a33f9 100644 --- a/test/stdout/0902 +++ b/test/stdout/0902 @@ -3,16 +3,16 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250 CHUNKING MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT ddd +BDAT 337 250 OK nonlast bdat -BDAT ddd LAST +BDAT 8380 LAST 250 OK bdat QUIT 225 OK @@ -21,14 +21,14 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250 CHUNKING MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT ddd +BDAT 337 500 oops bdat-nonlast QUIT 225 OK @@ -36,17 +36,17 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd +BDAT 337 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT ddd LAST +BDAT 8380 LAST 250 OK bdat QUIT 225 OK @@ -55,13 +55,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd +BDAT 337 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat (nonlast) ungood lacking mail-from @@ -71,13 +71,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd +BDAT 337 250 OK mail 550 no such recipient 500 oops nonlast bdat - no rcpt @@ -87,19 +87,19 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: RCPT TO: -BDAT ddd +BDAT 321 250 OK mail 550 no such recipient 250 good recipient 200 OK nonlast bdat -BDAT ddd LAST +BDAT 8380 LAST 250 OK bdat QUIT 225 OK @@ -107,13 +107,13 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd +BDAT 337 250 OK mail 250 OK rcpt 500 oops nonlast bdat @@ -123,17 +123,17 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd +BDAT 337 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT ddd LAST +BDAT 8380 LAST 500 oops bdat QUIT 225 OK @@ -141,17 +141,17 @@ End of script Listening on port 1224 ... Connection request from [127.0.0.1] 220 Greetings -EHLO the.local.host.name +EHLO testhost.test.ex 250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT ddd +BDAT 8191 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT ddd LAST +BDAT 849 LAST 250 OK bdat QUIT 225 OK diff --git a/test/stdout/2090 b/test/stdout/2090 index e198f1279..7bf70310a 100644 --- a/test/stdout/2090 +++ b/test/stdout/2090 @@ -1,9 +1,9 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -23,7 +23,7 @@ Attempting to start TLS Succeeded in starting TLS >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -37,7 +37,7 @@ Succeeded in starting TLS >>> MAIL FROM: ??? 250 <<< 250 OK ->>> RCPT TO: +>>> RCPT TO: ??? 250 <<< 250 Accepted >>> BDAT 88 LAST @@ -51,14 +51,14 @@ Succeeded in starting TLS <<< 250 OK id=10HmaX-0005vi-00 >>> QUIT ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -78,7 +78,7 @@ Attempting to start TLS Succeeded in starting TLS >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -90,7 +90,7 @@ Succeeded in starting TLS ??? 250 HELP <<< 250 HELP >>> MAIL FROM: ->>> RCPT TO: +>>> RCPT TO: >>> BDAT 88 LAST >>> To: Susan@random.com >>> From: Sam@random.com @@ -106,5 +106,5 @@ Succeeded in starting TLS <<< 250 OK id=10HmaY-0005vi-00 >>> QUIT ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script diff --git a/test/stdout/2190 b/test/stdout/2190 index 7942a8ce5..c1ee9ffcf 100644 --- a/test/stdout/2190 +++ b/test/stdout/2190 @@ -1,9 +1,9 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -37,7 +37,7 @@ SSL connection using AES256-SHA Succeeded in starting TLS >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -51,7 +51,7 @@ Succeeded in starting TLS >>> MAIL FROM: ??? 250 <<< 250 OK ->>> RCPT TO: +>>> RCPT TO: ??? 250 <<< 250 Accepted >>> BDAT 88 LAST @@ -65,14 +65,14 @@ Succeeded in starting TLS <<< 250 OK id=10HmaX-0005vi-00 >>> QUIT ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 -<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -106,7 +106,7 @@ SSL connection using AES256-SHA Succeeded in starting TLS >>> EHLO rhu.barb ??? 250- -<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1] +<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] ??? 250-SIZE <<< 250-SIZE 52428800 ??? 250-8BITMIME @@ -118,7 +118,7 @@ Succeeded in starting TLS ??? 250 HELP <<< 250 HELP >>> MAIL FROM: ->>> RCPT TO: +>>> RCPT TO: >>> BDAT 88 LAST >>> To: Susan@random.com >>> From: Sam@random.com @@ -134,5 +134,5 @@ Succeeded in starting TLS <<< 250 OK id=10HmaY-0005vi-00 >>> QUIT ??? 221 -<<< 221 the.local.host.name closing connection +<<< 221 testhost.test.ex closing connection End of script diff --git a/test/stdout/5591 b/test/stdout/5591 index b756ab32c..32cd8da8f 100644 --- a/test/stdout/5591 +++ b/test/stdout/5591 @@ -3,18 +3,18 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Server ready -EHLO the.local.host.name +EHLO testhost.test.ex 250-hiya matey 250-PRDR 250-CHUNKING 250 OK MAIL FROM:<> PRDR 250 OK -RCPT TO: +RCPT TO: 250 OK -RCPT TO: +RCPT TO: 250 OK -BDAT ddd LAST +BDAT 337 LAST 353 prdr responses coming up 250 first rcpt was good 250 second rcpt was good