From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 18 Nov 2019 13:11:22 +0000 (+0000)
Subject: [Minor] P0f: More output fixes
X-Git-Tag: 2.2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f03e5ef523da05a7080e8e5f2617af5162ccab4;p=thirdparty%2Frspamd.git

[Minor] P0f: More output fixes
---

diff --git a/lualib/lua_scanners/p0f.lua b/lualib/lua_scanners/p0f.lua
index 0e7bd42795..06953660d2 100644
--- a/lualib/lua_scanners/p0f.lua
+++ b/lualib/lua_scanners/p0f.lua
@@ -100,11 +100,17 @@ local function p0f_check(task, ip, rule)
       uptime_min, distance)
 
     if link_type and #link_type > 0 then
-      common.yield_result(task, rule, string.format('%s, link=%s, distance: %s',
-          os_string, link_type, distance), 0.0)
+      common.yield_result(task, rule, {
+        os_string,
+        'link=' .. link_type,
+        'distance=' .. distance},
+          0.0)
     else
-      common.yield_result(task, rule, string.format('%s, distance: %s',
-          os_string, distance), 0.0)
+      common.yield_result(task, rule, {
+        os_string,
+        'link=unknown',
+        'distance=' .. distance},
+          0.0)
     end
 
     return data
@@ -122,6 +128,8 @@ local function p0f_check(task, ip, rule)
 
       if err then
         rspamd_logger.errx(task, 'p0f received an error: %s', err)
+        common.yield_result(task, rule, 'Error getting result: ' .. err,
+            0.0, 'fail')
         return
       end