From 493e0e6648552c0dce6c5225c8438d2829f1ac11 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 4 Oct 2016 00:11:32 +0100 Subject: [PATCH] Testsuite: for CHUNKING set sender name explicitly for consistent chunk size on different platforms --- test/confs/0900 | 3 - test/log/0901 | 26 +++--- test/log/0902 | 18 ++-- test/log/2091 | 2 +- test/log/2191 | 2 +- test/log/4509 | 4 +- test/log/5591 | 2 +- test/scripts/0000-Basic/0901 | 156 ++++++++++++++++++++++++++--------- test/scripts/0000-Basic/0902 | 109 ++++++++++++++++++------ test/scripts/5500-PRDR/5591 | 13 ++- test/stdout/0901 | 26 +++--- test/stdout/0902 | 18 ++-- test/stdout/5591 | 2 +- 13 files changed, 259 insertions(+), 122 deletions(-) diff --git a/test/confs/0900 b/test/confs/0900 index 7a1296c7e..6816ef8c9 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -50,7 +50,6 @@ check_data: warn message = X-acl-message-linecount: $message_linecount accept - # ----- Routers ----- begin routers @@ -94,7 +93,6 @@ remote_smtp: allow_localhost command_timeout = 2s final_timeout = 2s - headers_rewrite = *@* CALLER_NAME@$domain fs remote_smtp_dkim: driver = smtp @@ -103,7 +101,6 @@ remote_smtp_dkim: allow_localhost command_timeout = 2s final_timeout = 2s - headers_rewrite = *@* CALLER_NAME@$domain fs .ifdef OPT dkim_domain = test.ex diff --git a/test/log/0901 b/test/log/0901 index c8f5d533e..92e4ae01a 100644 --- a/test/log/0901 +++ b/test/log/0901 @@ -1,38 +1,38 @@ -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 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for c@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for d@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for e@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for p@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for q@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for r@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for s@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for s1@test.ex +1999-03-02 09:44:33 10HmbG-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for t@test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for u@test.ex +1999-03-02 09:44:33 10HmbI-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for v@test.ex +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sender@source.dom U=root P=local-bsmtp 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 8d39088c6..53c5697ef 100644 --- a/test/log/0902 +++ b/test/log/0902 @@ -1,34 +1,34 @@ -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 <= sender@dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for d@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= sender@dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for p@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= sender@dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for s@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= sender@dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for t@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= sender@dom U=root P=local-bsmtp 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@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 <= sender@dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for u@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 <= sender@dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for v@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 <= sender@dom U=root P=local-bsmtp 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@testhost.test.ex U=CALLER P=local S=sss for p@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 <= sender@dom U=root P=local-bsmtp 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/2091 b/test/log/2091 index 174d6e732..c1ae955a8 100644 --- a/test/log/2091 +++ b/test/log/2091 @@ -1,5 +1,5 @@ 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- 363 byte chunk, total 363\\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=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 ******** diff --git a/test/log/2191 b/test/log/2191 index eb8acea9d..3d414f6e7 100644 --- a/test/log/2191 +++ b/test/log/2191 @@ -1,7 +1,7 @@ 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- 363 byte chunk, total 363\\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 ******** diff --git a/test/log/4509 b/test/log/4509 index f03691e5d..6a222d0b4 100644 --- a/test/log/4509 +++ b/test/log/4509 @@ -1,8 +1,8 @@ 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- 675 byte chunk, total 675\\n250 OK id=10HmaY-0005vi-00" +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- 665 byte chunk, total 665\\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@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- 8534 byte chunk, total 8862\\n250 OK id=10HmbA-0005vi-00" +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 8852\\n250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** diff --git a/test/log/5591 b/test/log/5591 index 395ffae3c..c8cdf557c 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@testhost.test.ex U=CALLER P=local S=sss for usery userz +1999-03-02 09:44:33 10HmaX-0005vi-00 <= sender@dom U=root P=local-bsmtp S=sss for usery@testhost.test.ex userz@testhost.test.ex 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/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901 index 53d8a9afb..2157e61a8 100644 --- a/test/scripts/0000-Basic/0901 +++ b/test/scripts/0000-Basic/0901 @@ -12,17 +12,23 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK QUIT 225 OK *eof **** -exim -odf a@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected more data, client gets timeout for data-ack @@ -35,16 +41,22 @@ MAIL FROM 250 good mail cmd RCPT TO 250 acceptable rcpt cmd -BDAT 346 LAST -*data 347 +BDAT 329 LAST +*data 330 250 OK got that data QUIT 225 OK quitting **** -exim -odf b@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected less data @@ -59,16 +71,22 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 345 +BDAT 329 LAST +*data 328 250 OK QUIT 225 OK **** -exim -odf c@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects BDAT cmd @@ -81,16 +99,22 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 500 oops QUIT 225 OK **** -exim -odf d@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server tmp-rejects BDAT cmd @@ -103,16 +127,22 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 400 not right now QUIT 225 OK **** -exim -odf e@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # @@ -129,8 +159,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 250 OK rcpt 250 OK bdat @@ -138,10 +168,16 @@ QUIT 225 OK *eof **** -exim -odf p@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected more data, client gets timeout for data-ack @@ -153,14 +189,20 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 347 +BDAT 329 LAST +*data 330 250 good mail cmd **** -exim -odf q@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected less data @@ -174,18 +216,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 345 +BDAT 329 LAST +*data 328 250 OK mail 250 OK rcpt 250 OK bdat QUIT 225 OK **** -exim -odf r@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects MAIL cmd @@ -199,18 +247,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from QUIT 225 OK **** -exim -odf s@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server tmp-rejects MAIL cmd @@ -222,18 +276,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 347 LAST -*data 347 +BDAT 330 LAST +*data 330 450 greylisted mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from QUIT 225 OK **** -exim -odf s1@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects RCPT cmd @@ -245,18 +305,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 550 no such recipient 500 oops bdat QUIT 225 OK **** -exim -odf t@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects BDAT cmd @@ -268,18 +334,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 250 OK rcpt 500 oops bdat QUIT 225 OK **** -exim -odf u@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server tmp-rejects BDAT cmd @@ -291,18 +363,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 250 OK rcpt 400 not right now bdat QUIT 225 OK **** -exim -odf v@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # diff --git a/test/scripts/0000-Basic/0902 b/test/scripts/0000-Basic/0902 index ebc275c1f..5be294087 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 340 -*data 340 +BDAT 295 +*data 295 250 OK nonlast bdat BDAT 8380 LAST *data 8380 @@ -22,7 +22,11 @@ QUIT 225 OK *eof **** -exim -odf a@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -115,6 +119,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # @@ -128,13 +134,17 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 340 -*data 340 +BDAT 295 +*data 295 500 oops bdat-nonlast QUIT 225 OK **** -exim -odf d@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -227,6 +237,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # @@ -243,10 +255,10 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 +BDAT 295 250 OK mail 250 OK rcpt -*data 340 +*data 295 250 OK nonlast bdat BDAT 8380 LAST *data 8380 @@ -255,7 +267,11 @@ QUIT 225 OK *eof **** -exim -odf p@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -348,6 +364,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects MAIL cmd @@ -362,15 +380,19 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat (nonlast) ungood lacking mail-from QUIT 225 OK **** -exim -odf s@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -463,6 +485,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects RCPT cmd @@ -474,15 +498,19 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 250 OK mail 550 no such recipient 500 oops nonlast bdat - no rcpt QUIT 225 OK **** -exim -odf t@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -575,6 +603,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects 1st RCPT cmd of two @@ -587,8 +617,8 @@ EHLO MAIL FROM RCPT TO RCPT TO -BDAT 324 -*data 324 +BDAT 279 +*data 279 250 OK mail 550 no such recipient 250 good recipient @@ -599,7 +629,12 @@ BDAT 8380 LAST QUIT 225 OK **** -exim -odf t1@test.ex t2@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -692,6 +727,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects initial BDAT cmd @@ -703,15 +740,19 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 250 OK mail 250 OK rcpt 500 oops nonlast bdat QUIT 225 OK **** -exim -odf u@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -804,6 +845,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects final BDAT cmd @@ -815,8 +858,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 250 OK mail 250 OK rcpt 250 OK nonlast bdat @@ -826,7 +869,11 @@ BDAT 8380 LAST QUIT 225 OK **** -exim -odf v@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -919,6 +966,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # message with long headers @@ -935,14 +984,18 @@ BDAT 8191 250 OK rcpt *data 8191 250 OK nonlast bdat -BDAT 852 LAST -*data 852 +BDAT 807 LAST +*data 807 250 OK bdat QUIT 225 OK *eof **** -exim -odf p@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo X-long_hdr: 0 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -1039,6 +1092,8 @@ X-long_hdr: 0 body 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # diff --git a/test/scripts/5500-PRDR/5591 b/test/scripts/5500-PRDR/5591 index 556945fe0..cf2af61b7 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 328 LAST -*data 328 +BDAT 285 LAST +*data 285 353 prdr responses coming up 250 first rcpt was good 250 second rcpt was good @@ -25,8 +25,15 @@ BDAT 328 LAST QUIT 250 OK **** -exim -odi -f sender_gets_replaced usery userz +sudo exim -odi -bS +EHLO +MAIL FROM: +RCPT TO: +RCPT TO: +DATA Some message text. +. +QUIT **** # # diff --git a/test/stdout/0901 b/test/stdout/0901 index 4867fbf37..a19787d12 100644 --- a/test/stdout/0901 +++ b/test/stdout/0901 @@ -10,7 +10,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 346 LAST +BDAT 329 LAST 250 OK QUIT 225 OK @@ -26,7 +26,7 @@ MAIL FROM:<> 250 good mail cmd RCPT TO: 250 acceptable rcpt cmd -BDAT 346 LAST +BDAT 329 LAST Unxpected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] @@ -38,7 +38,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 346 LAST +BDAT 329 LAST 250 OK Comparison failed - bailing out @@ -53,7 +53,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 346 LAST +BDAT 329 LAST 500 oops QUIT 225 OK @@ -68,7 +68,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 346 LAST +BDAT 329 LAST 400 not right now QUIT 225 OK @@ -82,7 +82,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 346 LAST +BDAT 329 LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -99,7 +99,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 346 LAST +BDAT 329 LAST Unxpected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] @@ -110,7 +110,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 346 LAST +BDAT 329 LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -126,7 +126,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 346 LAST +BDAT 329 LAST 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -142,7 +142,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 347 LAST +BDAT 330 LAST 450 greylisted mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -158,7 +158,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 346 LAST +BDAT 329 LAST 250 OK mail 550 no such recipient 500 oops bdat @@ -174,7 +174,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 346 LAST +BDAT 329 LAST 250 OK mail 250 OK rcpt 500 oops bdat @@ -190,7 +190,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 346 LAST +BDAT 329 LAST 250 OK mail 250 OK rcpt 400 not right now bdat diff --git a/test/stdout/0902 b/test/stdout/0902 index 2f45d6bda..22d02212e 100644 --- a/test/stdout/0902 +++ b/test/stdout/0902 @@ -10,7 +10,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 340 +BDAT 295 250 OK nonlast bdat BDAT 8380 LAST 250 OK bdat @@ -28,7 +28,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 340 +BDAT 295 500 oops bdat-nonlast QUIT 225 OK @@ -42,7 +42,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 340 +BDAT 295 250 OK mail 250 OK rcpt 250 OK nonlast bdat @@ -61,7 +61,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 340 +BDAT 295 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat (nonlast) ungood lacking mail-from @@ -77,7 +77,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 340 +BDAT 295 250 OK mail 550 no such recipient 500 oops nonlast bdat - no rcpt @@ -94,7 +94,7 @@ EHLO testhost.test.ex MAIL FROM:<> RCPT TO: RCPT TO: -BDAT 324 +BDAT 279 250 OK mail 550 no such recipient 250 good recipient @@ -113,7 +113,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 340 +BDAT 295 250 OK mail 250 OK rcpt 500 oops nonlast bdat @@ -129,7 +129,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 340 +BDAT 295 250 OK mail 250 OK rcpt 250 OK nonlast bdat @@ -151,7 +151,7 @@ BDAT 8191 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT 852 LAST +BDAT 807 LAST 250 OK bdat QUIT 225 OK diff --git a/test/stdout/5591 b/test/stdout/5591 index 2471a75fb..4794b4a60 100644 --- a/test/stdout/5591 +++ b/test/stdout/5591 @@ -14,7 +14,7 @@ RCPT TO: 250 OK RCPT TO: 250 OK -BDAT 328 LAST +BDAT 285 LAST 353 prdr responses coming up 250 first rcpt was good 250 second rcpt was good -- 2.30.2