]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Minor] Fix previous commit
authorAndrew Lewis <nerf@judo.za.org>
Wed, 24 Jan 2018 11:52:10 +0000 (13:52 +0200)
committerAndrew Lewis <nerf@judo.za.org>
Wed, 24 Jan 2018 11:52:10 +0000 (13:52 +0200)
src/plugins/lua/antivirus.lua
test/functional/util/dummy_fprot.py

index 0a16ff145a9f64f97efc133904866b7c66495832..59ec3ad0d858db072601ab436a09d7c8370a61f2 100644 (file)
@@ -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
index 3bcdb729268b55c8d04cbafd2e508b658d993864..c35f0628f5f579f197990429de5e5e23f7d0c91e 100755 (executable)
@@ -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()