Use separate line in Received: header for timestamp

9 files changed, 66 insertions, 59 deletions

diff --git a/test/scripts/0000-Basic/0904 b/test/scripts/0000-Basic/0904
index 9f09a84ef..270a1167c 100644
--- a/test/scripts/0000-Basic/0904
+++ b/test/scripts/0000-Basic/0904
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK
 QUIT
 225 OK
@@ -41,8 +41,8 @@ MAIL FROM
 250 good mail cmd
 RCPT TO
 250 acceptable rcpt cmd
-BDAT 329 LAST
-*data 330
+BDAT 331 LAST
+*data 332
 250 OK got that data
 QUIT
 225 OK quitting
@@ -71,8 +71,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 328
+BDAT 331 LAST
+*data 330
 250 OK
 QUIT
 225 OK
@@ -99,8 +99,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 500 oops
 QUIT
 225 OK
@@ -127,8 +127,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 400 not right now
 QUIT
 225 OK
@@ -184,8 +184,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -219,8 +219,8 @@ QUIT
 #250 CHUNKING
 #MAIL FROM
 #RCPT TO
-#BDAT 329 LAST
-#*data 330
+#BDAT 331 LAST
+#*data 332
 #250 good mail cmd
 #****
 #sudo exim -odf -bS
@@ -246,8 +246,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 328
+BDAT 331 LAST
+*data 330
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -277,8 +277,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -306,8 +306,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 330 LAST
-*data 330
+BDAT 332 LAST
+*data 332
 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -335,8 +335,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 550 no such recipient
 500 oops bdat
@@ -364,8 +364,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -393,8 +393,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 400 not right now bdat
diff --git a/test/scripts/0000-Basic/0905 b/test/scripts/0000-Basic/0905
index dcad5441d..5ec145e1a 100644
--- a/test/scripts/0000-Basic/0905
+++ b/test/scripts/0000-Basic/0905
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -134,8 +134,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -255,10 +255,10 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
+BDAT 297
 250 OK mail
 250 OK rcpt
-*data 295
+*data 297
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -380,8 +380,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat (nonlast) ungood lacking mail-from
@@ -498,8 +498,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 550 no such recipient
 500 oops nonlast bdat - no rcpt
@@ -617,8 +617,8 @@ EHLO
 MAIL FROM
 RCPT TO
 RCPT TO
-BDAT 279
-*data 279
+BDAT 281
+*data 281
 250 OK mail
 550 no such recipient
 250 good recipient
@@ -740,8 +740,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -858,8 +858,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
@@ -979,8 +979,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 400 oops nonlast bdat
@@ -1103,8 +1103,8 @@ BDAT 8191
 250 OK rcpt
 *data 8191
 250 OK nonlast bdat
-BDAT 807 LAST
-*data 807
+BDAT 809 LAST
+*data 809
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/scripts/0000-Basic/0911 b/test/scripts/0000-Basic/0911
index c6979899b..39b7f0092 100644
--- a/test/scripts/0000-Basic/0911
+++ b/test/scripts/0000-Basic/0911
@@ -11,10 +11,10 @@ EHLO
 250 OK
 MAIL FROM
 RCPT TO
-BDAT 313 LAST
+BDAT 315 LAST
 250 OK mail
 250 OK rcpt
-*data 313
+*data 315
 QUIT
 250 OK chunked message data
 221 Closing connection
@@ -39,8 +39,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 315 LAST
-*data 315
+BDAT 317 LAST
+*data 317
 250 OK chunked message data
 QUIT
 221 Closing connection
@@ -68,8 +68,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 319 LAST
-*data 319
+BDAT 321 LAST
+*data 321
 QUIT
 451 Service not available
 221 Closing connection
@@ -98,8 +98,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 319 LAST
-*data 319
+BDAT 321 LAST
+*data 321
 QUIT
 550 content rejected
 221 Closing connection
@@ -126,8 +126,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 317 LAST
-*data 317
+BDAT 319 LAST
+*data 319
 >*eof
 ****
 sudo exim -d-all+transport -odi -bs
diff --git a/test/scripts/4000-scanning/4003 b/test/scripts/4000-scanning/4003
index d9849c341..1f4917d9b 100644
--- a/test/scripts/4000-scanning/4003
+++ b/test/scripts/4000-scanning/4003
@@ -20,6 +20,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -80,6 +81,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -138,6 +140,7 @@ server -i 2 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -197,6 +200,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
diff --git a/test/scripts/4000-scanning/4004 b/test/scripts/4000-scanning/4004
index e5a7c9492..72e77a058 100644
--- a/test/scripts/4000-scanning/4004
+++ b/test/scripts/4000-scanning/4004
@@ -22,6 +22,7 @@ server 11333
 <	(envelope
 <	id
 <	for
+<	
 <From:
 <Content-type: text/plain
 <Message-Id:
diff --git a/test/scripts/4006_scan_clamd/4006 b/test/scripts/4006_scan_clamd/4006
index 91d08bd68..db5039f7c 100644
--- a/test/scripts/4006_scan_clamd/4006
+++ b/test/scripts/4006_scan_clamd/4006
@@ -148,6 +148,7 @@ server PORT_D
 <\x09(envelope-from <
 <\x09id
 <\x09for userx@test.ex;
+<\x09
 <Date:
 <Subject: message should be accepted
 <Message-Id: <
diff --git a/test/scripts/4015-scan-ipv6/4015 b/test/scripts/4015-scan-ipv6/4015
index 9e4a857be..b3412123a 100644
--- a/test/scripts/4015-scan-ipv6/4015
+++ b/test/scripts/4015-scan-ipv6/4015
@@ -15,6 +15,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
diff --git a/test/scripts/5500-PRDR/5591 b/test/scripts/5500-PRDR/5591
index cf2af61b7..1ab748890 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 285 LAST
-*data 285
+BDAT 287 LAST
+*data 287
 353 prdr responses coming up
 250 first rcpt was good
 250 second rcpt was good
diff --git a/test/scripts/5800-DANE/5800 b/test/scripts/5800-DANE/5800
index 98a70c115..7b74fc1b7 100644
--- a/test/scripts/5800-DANE/5800
+++ b/test/scripts/5800-DANE/5800
@@ -1,4 +1,4 @@
-# Expansion test for DANE.
+# Expansion test for DANE
 #
 # Some systems seem to use 1-byte fields for the leading
 # 3 fields in a TLSA record, others 2-bytes.