X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/7eb6c37c5084760c1d1469bd4be652b479a8df55..600dc06981df5a906125f8442c36056a117412d4:/test/stdout/4006

diff --git a/test/stdout/4006 b/test/stdout/4006
index 19e0f305b..6f3d15eec 100644
--- a/test/stdout/4006
+++ b/test/stdout/4006
@@ -1,17 +1,19 @@
 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-LIMITS MAILMAX=1000 RCPTMAX=50000
 250-8BITMIME
 250-PIPELINING
 250 HELP
 250 OK
 250 Accepted
 354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
 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-LIMITS MAILMAX=1000 RCPTMAX=50000
 250-8BITMIME
 250-PIPELINING
 250 HELP
@@ -23,6 +25,7 @@
 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-LIMITS MAILMAX=1000 RCPTMAX=50000
 250-8BITMIME
 250-PIPELINING
 250 HELP
@@ -34,6 +37,7 @@
 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-LIMITS MAILMAX=1000 RCPTMAX=50000
 250-8BITMIME
 250-PIPELINING
 250 HELP
@@ -45,50 +49,91 @@
 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-LIMITS MAILMAX=1000 RCPTMAX=50000
 250-8BITMIME
 250-PIPELINING
 250 HELP
 250 OK
 250 Accepted
 354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
+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-LIMITS MAILMAX=1000 RCPTMAX=50000
+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
+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-LIMITS MAILMAX=1000 RCPTMAX=50000
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-000000005vi-0000
 221 myhost.test.ex closing connection
 
 ******** SERVER ********
-Listening on TESTSUITE/eximdir/avast_sock ... 
+Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
->LF>220 ready
-<FLAGS -fullfiles
->LF>210 FLAGS DATA
->LF>200 FLAGS OK
-<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00
->LF>210 SCAN DATA
->LF>blah\x09[+]
->LF>200 SCAN OK
-<QUIT
-Unexpected EOF read from client
+<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000/10HmbB-000000005vi-0000.eml
+>LF>scanned_file_name: OK
+Expected EOF read from client
 End of script
-Listening on TESTSUITE/eximdir/avast_sock ... 
+Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
->LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00
->LF>210 SCAN DATA
->LF>blah\x09[E]
->LF>200 SCAN OK
-Unexpected EOF read from client
-Listening on TESTSUITE/eximdir/avast_sock ... 
+<SCAN TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml
+>LF>scanned_file_name: 666 ERROR
+Expected EOF read from client
+End of script
+Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
->LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00
->LF>210 SCAN DATA
->LF>b\\ l\\ a\\ h\x09[L]9.9\x099 VNAME
->LF>200 SCAN OK
-Unexpected EOF read from client
-Listening on TESTSUITE/eximdir/avast_sock ... 
+<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml
+>LF>scanned_file_name: VNAME FOUND
+Expected EOF read from client
+End of script
+Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 *sleep 3
 End of script
-Listening on TESTSUITE/eximdir/avast_sock ... 
+Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 *sleep 3
 End of script
+Inital pause of 2 seconds
+Listening on TESTSUITE/eximdir/clam_sock ... 
+Connection request
+<SCAN TESTSUITE/spool/scan/10HmbC-000000005vi-0000/10HmbC-000000005vi-0000.eml
+>LF>scanned_file_name: OK
+Expected EOF read from client
+End of script
+Listening on port 1225 ... 
+Connection request from [127.0.0.1]
+<zINSTREAM
+<X-Envelope-From: <CALLER@myhost.test.ex>
+<X-Envelope-To: userx@test.ex
+<Received: from CALLER (helo=test.ex)
+<	by myhost.test.ex with local-esmtp (Exim x.yz)
+<	(envelope-from <CALLER@myhost.test.ex>)
+<	id 10HmbD-000000005vi-0000
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
+<Date: Tue, 2 Mar 1999 09:44:33 +0000
+<Subject: message should be accepted
+<Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex>
+<From: CALLER_NAME <CALLER@myhost.test.ex>
+<
+<
+>LF>scanned_file_name: OK
+Expected EOF read from client
+End of script