From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 8 Sep 2020 12:37:25 +0000 (+0100)
Subject: [Fix] Fix authentication results insertion
X-Git-Tag: 2.6~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e12a0910cf46c93ce7a2210d0d8a91c4b538f589;p=thirdparty%2Frspamd.git

[Fix] Fix authentication results insertion
---

diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index 0304b863a2..d6b06c9a9b 100644
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -102,31 +102,6 @@ local settings = {
     ['authentication-results'] = {
       header = 'Authentication-Results',
       remove = 0,
-      spf_symbols = {
-        pass = 'R_SPF_ALLOW',
-        fail = 'R_SPF_FAIL',
-        softfail = 'R_SPF_SOFTFAIL',
-        neutral = 'R_SPF_NEUTRAL',
-        temperror = 'R_SPF_DNSFAIL',
-        none = 'R_SPF_NA',
-        permerror = 'R_SPF_PERMFAIL',
-      },
-      dkim_symbols = {
-        pass = 'R_DKIM_ALLOW',
-        fail = 'R_DKIM_REJECT',
-        temperror = 'R_DKIM_TEMPFAIL',
-        none = 'R_DKIM_NA',
-        permerror = 'R_DKIM_PERMFAIL',
-      },
-      dmarc_symbols = {
-        pass = 'DMARC_POLICY_ALLOW',
-        permerror = 'DMARC_BAD_POLICY',
-        temperror = 'DMARC_DNSFAIL',
-        none = 'DMARC_NA',
-        reject = 'DMARC_POLICY_REJECT',
-        softfail = 'DMARC_POLICY_SOFTFAIL',
-        quarantine = 'DMARC_POLICY_QUARANTINE',
-      },
       add_smtp_user = true,
       stop_chars = ';',
     },
@@ -472,8 +447,7 @@ local function milter_headers(task)
           settings.routines['authentication-results'].remove
     end
 
-    local res = ar.gen_auth_results(task,
-      settings.routines['authentication-results'])
+    local res = ar.gen_auth_results(task, nil)
 
     if res then
       add_header('authentication-results', res, ';', 1)