Change separators to commas to avoid issues with ipv6.

diff --git a/doc/markdown/modules/dmarc.md b/doc/markdown/modules/dmarc.md
index 191e1c21621baceeff1f9f5717b2adfbd0c824e6..c69fa30152775304c7958a7d93f06b81a2b2e7af 100644 (file)
--- a/doc/markdown/modules/dmarc.md
+++ b/doc/markdown/modules/dmarc.md
@@ -36,7 +36,7 @@ When you have this module enabled, it also adds symbols:
 
 When a message violates DMARC policy, rspamd adds the following information to `redis` server:
 
-    unixtime:ip:spf_result:dkim_result
+    unixtime,ip,spf_result,dkim_result
 
 where results are `true` or `false` meaning allow and reject values accordingly.
 Unixtime and IP are inserted in text form. Keys are therefore `lists` in redis terminology.

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index d965cefc3384b2cb25a61407dbcf2d67900a5f83..ee24794dc288e2cdf6023df241fdd1a1cea2a21c 100644 (file)
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -56,7 +56,7 @@ local function dmarc_report(task, spf_ok, dkim_ok)
   if not ip:is_valid() then
     return nil
   end
-  local res = string.format('%d:%s:%s:%s', task:get_date(0),
+  local res = string.format('%d,%s,%s,%s', task:get_date(0),
     ip:to_string(), tostring(spf_ok), tostring(dkim_ok))
     
   return res