Testsuite: for CHUNKING rewrite sender name in headers to consistent value

for consistent chunk size on different test platforms

10 files changed, 75 insertions, 73 deletions

diff --git a/test/confs/0900 b/test/confs/0900
index 21fbf0901..7a1296c7e 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -94,6 +94,7 @@ remote_smtp:
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
+  headers_rewrite = *@* CALLER_NAME@$domain fs
 
 remote_smtp_dkim:
   driver = smtp
@@ -102,6 +103,7 @@ 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/2091 b/test/log/2091
index c1ae955a8..174d6e732 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- 360 byte chunk, total 360\\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- 363 byte chunk, total 363\\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 3d414f6e7..eb8acea9d 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- 360 byte chunk, total 360\\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- 363 byte chunk, total 363\\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 6a222d0b4..f03691e5d 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- 665 byte chunk, total 665\\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- 675 byte chunk, total 675\\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- 8524 byte chunk, total 8852\\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- 8534 byte chunk, total 8862\\n250 OK id=10HmbA-0005vi-00"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 
 ******** SERVER ********
diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901
index fef95ba6e..53d8a9afb 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 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 250 OK
 QUIT
 225 OK
@@ -35,8 +35,8 @@ MAIL FROM
 250 good mail cmd
 RCPT TO
 250 acceptable rcpt cmd
-BDAT 343 LAST
-*data 344
+BDAT 346 LAST
+*data 347
 250 OK got that data
 QUIT
 225 OK quitting
@@ -59,8 +59,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 343 LAST
-*data 342
+BDAT 346 LAST
+*data 345
 250 OK
 QUIT
 225 OK
@@ -81,8 +81,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 500 oops
 QUIT
 225 OK
@@ -103,8 +103,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 400 not right now
 QUIT
 225 OK
@@ -129,8 +129,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -153,8 +153,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 343 LAST
-*data 344
+BDAT 346 LAST
+*data 347
 250 good mail cmd
 ****
 exim -odf q@test.ex
@@ -174,8 +174,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 343 LAST
-*data 342
+BDAT 346 LAST
+*data 345
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -199,8 +199,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 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 344 LAST
-*data 344
+BDAT 347 LAST
+*data 347
 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 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 250 OK mail
 550 no such recipient
 500 oops bdat
@@ -268,8 +268,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -291,8 +291,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 343 LAST
-*data 343
+BDAT 346 LAST
+*data 346
 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 eb262ee38..ebc275c1f 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 337
-*data 337
+BDAT 340
+*data 340
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -128,8 +128,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 337
-*data 337
+BDAT 340
+*data 340
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -243,10 +243,10 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 337
+BDAT 340
 250 OK mail
 250 OK rcpt
-*data 337
+*data 340
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -362,8 +362,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 337
-*data 337
+BDAT 340
+*data 340
 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 337
-*data 337
+BDAT 340
+*data 340
 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 321
-*data 321
+BDAT 324
+*data 324
 250 OK mail
 550 no such recipient
 250 good recipient
@@ -703,8 +703,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 337
-*data 337
+BDAT 340
+*data 340
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -815,8 +815,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 337
-*data 337
+BDAT 340
+*data 340
 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 849 LAST
-*data 849
+BDAT 852 LAST
+*data 852
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/scripts/5500-PRDR/5591 b/test/scripts/5500-PRDR/5591
index 1ed52896f..556945fe0 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 337 LAST
-*data 337
+BDAT 328 LAST
+*data 328
 353 prdr responses coming up
 250 first rcpt was good
 250 second rcpt was good
diff --git a/test/stdout/0901 b/test/stdout/0901
index 88f2c40de..4867fbf37 100644
--- a/test/stdout/0901
+++ b/test/stdout/0901
@@ -10,7 +10,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<a@test.ex>
 250 OK
-BDAT 343 LAST
+BDAT 346 LAST
 250 OK
 QUIT
 225 OK
@@ -26,7 +26,7 @@ MAIL FROM:<>
 250 good mail cmd
 RCPT TO:<b@test.ex>
 250 acceptable rcpt cmd
-BDAT 343 LAST
+BDAT 346 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:<c@test.ex>
 250 OK
-BDAT 343 LAST
+BDAT 346 LAST
 250 OK
 
 Comparison failed - bailing out
@@ -53,7 +53,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<d@test.ex>
 250 OK
-BDAT 343 LAST
+BDAT 346 LAST
 500 oops
 QUIT
 225 OK
@@ -68,7 +68,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<e@test.ex>
 250 OK
-BDAT 343 LAST
+BDAT 346 LAST
 400 not right now
 QUIT
 225 OK
@@ -82,7 +82,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<p@test.ex>
-BDAT 343 LAST
+BDAT 346 LAST
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -99,7 +99,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<q@test.ex>
-BDAT 343 LAST
+BDAT 346 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:<r@test.ex>
-BDAT 343 LAST
+BDAT 346 LAST
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -126,7 +126,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>
-BDAT 343 LAST
+BDAT 346 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:<s1@test.ex>
-BDAT 344 LAST
+BDAT 347 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:<t@test.ex>
-BDAT 343 LAST
+BDAT 346 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:<u@test.ex>
-BDAT 343 LAST
+BDAT 346 LAST
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -190,7 +190,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>
-BDAT 343 LAST
+BDAT 346 LAST
 250 OK mail
 250 OK rcpt
 400 not right now bdat
diff --git a/test/stdout/0902 b/test/stdout/0902
index 5ab9a33f9..2f45d6bda 100644
--- a/test/stdout/0902
+++ b/test/stdout/0902
@@ -10,7 +10,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<a@test.ex>
 250 OK
-BDAT 337
+BDAT 340
 250 OK nonlast bdat
 BDAT 8380 LAST
 250 OK bdat
@@ -28,7 +28,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<d@test.ex>
 250 OK
-BDAT 337
+BDAT 340
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -42,7 +42,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<p@test.ex>
-BDAT 337
+BDAT 340
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
@@ -61,7 +61,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>
-BDAT 337
+BDAT 340
 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:<t@test.ex>
-BDAT 337
+BDAT 340
 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:<t1@test.ex>
 RCPT TO:<t2@test.ex>
-BDAT 321
+BDAT 324
 250 OK mail
 550 no such recipient
 250 good recipient
@@ -113,7 +113,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>
-BDAT 337
+BDAT 340
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -129,7 +129,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>
-BDAT 337
+BDAT 340
 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 849 LAST
+BDAT 852 LAST
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/stdout/5591 b/test/stdout/5591
index 32cd8da8f..2471a75fb 100644
--- a/test/stdout/5591
+++ b/test/stdout/5591
@@ -14,7 +14,7 @@ RCPT TO:<usery@testhost.test.ex>
 250 OK
 RCPT TO:<userz@testhost.test.ex>
 250 OK
-BDAT 337 LAST
+BDAT 328 LAST
 353 prdr responses coming up
 250 first rcpt was good
 250 second rcpt was good