From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 24 Mar 2021 11:18:16 +0000 (+0000)
Subject: [Project] Dmarc: Use full recipient address instead of a domain map
X-Git-Tag: 3.0~557
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3d33f2d2d508839c2fd9a27f67a187f96933f88;p=thirdparty%2Frspamd.git

[Project] Dmarc: Use full recipient address instead of a domain map
---

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index b6174c0934..f6793745bd 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -1469,7 +1469,7 @@ if opts.munging then
   end
 
   munging_opts.list_map = lua_maps.map_add_from_ucl(munging_opts.list_map,
-      'set', 'DMARC munging map')
+      'set', 'DMARC munging map of the recipients addresses to munge')
 
   if not munging_opts.list_map  then
     rspamd_logger.errx(rspamd_config, 'cannot enable DMARC munging with invalid list_map (invalid map)')
@@ -1536,7 +1536,7 @@ if opts.munging then
     local rcpt_found
     if mr then
       for _,r in ipairs(mr) do
-        if r.domain and munging_opts.list_map:get_key(r.domain) then
+        if r.domain and munging_opts.list_map:get_key(r.addr) then
           rcpt_found = r
           break
         end