X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c11d665dab975691024f9231ad93c65bef7e5df4..c1ee83eb81665eac64862f3ad66ecf2ec056b1ec:/test/scripts/4006_scan_clamd/4006

diff --git a/test/scripts/4006_scan_clamd/4006 b/test/scripts/4006_scan_clamd/4006
index d251c1a1f..db5039f7c 100644
--- a/test/scripts/4006_scan_clamd/4006
+++ b/test/scripts/4006_scan_clamd/4006
@@ -2,15 +2,16 @@
 #
 # SCAN command interface, on a unix socket, only.  No ExtendedDetectionInfo.
 #
+# Pass
 server DIR/eximdir/clam_sock
 <SCAN
 >LF>scanned_file_name: OK
-<*eof
+*eof
 ****
 #
 #
 #
-exim -odi -bs -DOPT=
+exim -odi -bs -DSRV=DIR/eximdir/clam_sock -DOPT=
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -24,15 +25,16 @@ quit
 #
 #
 #
+# fail/error
 server DIR/eximdir/clam_sock
 <SCAN
 >LF>scanned_file_name: 666 ERROR
-<*eof
+*eof
 ****
 #
 #
 #
-exim -odi -bs -DOPT=
+exim -odi -bs -DSRV=DIR/eximdir/clam_sock -DOPT=
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -46,15 +48,16 @@ quit
 #
 #
 #
+# fail/virus-found
 server DIR/eximdir/clam_sock
 <SCAN
 >LF>scanned_file_name: VNAME FOUND
-<*eof
+*eof
 ****
 #
 #
 #
-exim -odi -bs -DOPT=/defer_ok
+exim -odi -bs -DSRV=DIR/eximdir/clam_sock -DOPT=/defer_ok
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -68,13 +71,14 @@ quit
 #
 #
 #
+# times out
 server DIR/eximdir/clam_sock
 *sleep 3
 ****
 #
 #
 #
-exim -odi -bs -DOPT="/ tmo=2s"
+exim -odi -bs -DSRV=DIR/eximdir/clam_sock -DOPT="/ tmo=2s"
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -88,13 +92,14 @@ quit
 #
 #
 #
+# times out
 server DIR/eximdir/clam_sock
 *sleep 3
 ****
 #
 #
 #
-exim -odi -bs -DOPT="/ tmo=2s / defer_ok"
+exim -odi -bs -DSRV=DIR/eximdir/clam_sock -DOPT="/ tmo=2s / defer_ok"
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -109,13 +114,14 @@ quit
 #
 #
 #
+# connect-fail (server not initially listenting), retry
 server -i 2 DIR/eximdir/clam_sock
 <SCAN
 >LF>scanned_file_name: OK
-<*eof
+*eof
 ****
 #
-exim -odi -bs -DCONTROL="retry=4s"
+exim -odi -bs -DSRV=DIR/eximdir/clam_sock -DCONTROL="retry=4s"
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -127,3 +133,40 @@ Subject: message should be accepted after a retry
 quit
 ****
 #
+################################################################################
+#
+# TCP clamd server connection, default protocol
+#  only checks the protocol header, filesize element and start of eml file lines;
+#  not the post-file protocol mark
+# Pass
+server PORT_D
+<zINSTREAM\x00\x00\x00\x01\xe5From MAILER-DAEMON
+<X-Envelope-From: <
+<X-Envelope-To: userx@test.ex
+<Received: from
+<\x09by myhost.test.ex with local-esmtp
+<\x09(envelope-from <
+<\x09id
+<\x09for userx@test.ex;
+<\x09
+<Date:
+<Subject: message should be accepted
+<Message-Id: <
+<From:
+<
+<
+>LF>scanned_file_name: OK
+*eof
+****
+#
+exim -odi -bs -DSRV="127.0.0.1 PORT_D" -DOPT=
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+Date: Fri, 17 Dec 2004 14:35:01 +0100
+Subject: message should be accepted
+
+.
+quit
+****