From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 10 Sep 2015 09:55:28 +0000 (+0100)
Subject: Change separators to commas to avoid issues with ipv6.
X-Git-Tag: 1.0.0~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38a6ceb5fff743c2233b79920ee2d1ff7a6a0cdc;p=thirdparty%2Frspamd.git

Change separators to commas to avoid issues with ipv6.
---

diff --git a/doc/markdown/modules/dmarc.md b/doc/markdown/modules/dmarc.md
index 191e1c2162..c69fa30152 100644
--- 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 d965cefc33..ee24794dc2 100644
--- 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