Fix cutthrough delivery for more than one iteration of address redirection. Bug...

[exim.git] / test / scripts / 4007_scan_avast / 4007

diff --git a/test/scripts/4007_scan_avast/4007 b/test/scripts/4007_scan_avast/4007
index 0611f2a96782a3b691b066fe9df425ae467316cc..fc6c627cfafc9e4261bc185e8c235efca9edc879 100644 (file)
--- a/test/scripts/4007_scan_avast/4007
+++ b/test/scripts/4007_scan_avast/4007
@@ -28,13 +28,13 @@ quit
 ****
 #
 #
-#
+### (non-internal) scanner error -> paniclog
 server DIR/eximdir/avast_sock
 >LF>220 ready
 <SCAN
 >LF>210 SCAN DATA
->LF>blah       [E]
->LF>200 SCAN OK
+>LF>blah       [E]0.0  Error 13 Permission\\ denied
+>LF>451 SCAN Engine error 13 Permission denied
 <QUIT
 *eof
 ****
@@ -59,7 +59,7 @@ server DIR/eximdir/avast_sock
 >LF>220 ready
 <SCAN
 >LF>210 SCAN DATA
->LF>b\\ l\\ a\\ h      [L]9.9  9 VNAME
+>LF>b\\ l\\ a\\ h      [L]9.0  0 VNAME
 >LF>200 SCAN OK
 <QUIT
 *eof
@@ -118,3 +118,29 @@ Subject: message should be accepted despite timeout
 .
 quit
 ****
+#
+#
+### internal scanner error, no panic log
+server DIR/eximdir/avast_sock
+>LF>220 ready
+<SCAN
+>LF>210 SCAN DATA
+>LF>blah       [E]0.0  Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb
+>LF>200 SCAN OK
+<QUIT
+*eof
+****
+#
+#
+#
+exim -odi -bs -DOPTION= -DINSERT=
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+Date: Fri, 17 Dec 2004 14:35:01 +0100
+Subject: defer this one, the scanner had an error
+
+.
+quit
+****