X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ad93c40fe70f7de49ffb8601a589e9ffa117d512..690bc2ce8c7f0a76f01d03b5b158b0d64abbc86a:/test/stdout/4017?ds=sidebyside

diff --git a/test/stdout/4017 b/test/stdout/4017
index 388af3dd4..079b7dade 100644
--- a/test/stdout/4017
+++ b/test/stdout/4017
@@ -8,7 +8,7 @@
 250 OK
 250 Accepted
 354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
 221 myhost.test.ex closing connection
 ### scanner tmpfail -> defer
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -44,6 +44,28 @@
 354 Enter message, ending with "." on a line by itself
 550 Administrative prohibition
 221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-000000005vi-0000
+221 myhost.test.ex closing connection
 
 ******** SERVER ********
 ### clean |  multiline response
@@ -55,7 +77,7 @@ Connection request
 >LF>FLAGS -fullfiles
 >LF>FLAGS +extra
 >LF>200 FLAGS OK
-<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean1\x09[+]
 >LF>/bin/clean2\x09[+]
@@ -67,7 +89,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmaX-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/error\x09[E]0.0\x09Error 13 Permission\\ denied
 >LF>451 SCAN Engine error 13 Permission denied
@@ -77,7 +99,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaY-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmaY-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean\x09[+]
 >LF>v\\ i\\ a\\ r\\ u\\ s\x09[L]9.0\x090 This\\ is\\ not\\ even\\ an\\ EICAR\\ test\\ virus.
@@ -88,7 +110,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmaZ-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean\x09[+]
 >LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb
@@ -97,3 +119,25 @@ Connection request
 <QUIT
 Expected EOF read from client
 End of script
+Listening on TESTSUITE/eximdir/avast_sock ... 
+Connection request
+>LF>220 ready
+<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000
+>LF>210 SCAN DATA
+>LF>/bin/clean\x09[+]
+>LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb
+>LF>200 SCAN OK
+<QUIT
+Expected EOF read from client
+End of script
+Listening on TESTSUITE/eximdir/avast_sock ... 
+Connection request
+>LF>220 ready
+<SCAN TESTSUITE/spool/scan/10HmbC-000000005vi-0000
+>LF>210 SCAN DATA
+>LF>/bin/clean\x09[+]
+>LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb
+>LF>200 SCAN OK
+<QUIT
+Expected EOF read from client
+End of script