aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lewis <nerf@judo.za.org>2018-01-24 13:52:10 +0200
committerAndrew Lewis <nerf@judo.za.org>2018-01-24 13:52:10 +0200
commit54b527ee1e2d43dd586d53bea32ec1de91af773b (patch)
tree021ed7bc1958b25ff803ebfff6b8de2f8d86b6d6
parente21d0ba5d3d01655645fb72687c62f2d27d756b5 (diff)
downloadrspamd-54b527ee1e2d43dd586d53bea32ec1de91af773b.tar.gz
rspamd-54b527ee1e2d43dd586d53bea32ec1de91af773b.zip
[Minor] Fix previous commit
-rw-r--r--src/plugins/lua/antivirus.lua2
-rwxr-xr-xtest/functional/util/dummy_fprot.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index 0a16ff145..59ec3ad0d 100644
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -410,7 +410,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 3bcdb7292..c35f0628f 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()