From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 24 Jan 2018 11:52:10 +0000 (+0200)
Subject: [Minor] Fix previous commit
X-Git-Tag: 1.6.6~3^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=166945152e3f7f9573905218470b8c769c931b2e;p=thirdparty%2Frspamd.git

[Minor] Fix previous commit
---

diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index b3523ba68e..d02cbb78c3 100644
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -391,7 +391,7 @@ local function fprot_check(task, rule)
             rspamd_logger.infox(task, '%s [%s]: message is clean', rule['symbol'], rule['type'])
           end
         else
-          local vname = string.match(data, '^1 <infected: (.+?)>')
+          local vname = string.match(data, '^1 <infected: (.-)>')
           if not vname then
             rspamd_logger.errx(task, 'Unhandled response: %s', data)
           else
diff --git a/test/functional/util/dummy_fprot.py b/test/functional/util/dummy_fprot.py
index 082934f4d3..c800e461e3 100755
--- a/test/functional/util/dummy_fprot.py
+++ b/test/functional/util/dummy_fprot.py
@@ -16,7 +16,7 @@ class MyTCPHandler(socketserver.BaseRequestHandler):
         os.remove(PID)
         self.data = self.request.recv(1024).strip()
         if self.server.foundvirus:
-            self.request.sendall(b"1 <infected: EICAR_Test_File> FOO\n")
+            self.request.sendall(b"1 <infected: EICAR_Test_File> FOO->bar\n")
         else:
             self.request.sendall(b"0 <clean> FOO\n")
         self.request.close()