From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 27 Mar 2018 09:52:42 +0000 (+0100)
Subject: [Minor] Ignore r= attribute in DKIM record
X-Git-Tag: 1.7.3~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6283d393ff71576cd93ef04b935115cbefb0fa6e;p=thirdparty%2Frspamd.git

[Minor] Ignore r= attribute in DKIM record

Issue: #2119
Closes: #2119
---

diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c
index dcf4403550..5daa2cdafb 100644
--- a/src/libserver/dkim.c
+++ b/src/libserver/dkim.c
@@ -54,7 +54,8 @@ enum rspamd_dkim_param_type {
 	DKIM_PARAM_BODYHASH,
 	DKIM_PARAM_BODYLENGTH,
 	DKIM_PARAM_IDX,
-	DKIM_PARAM_CV
+	DKIM_PARAM_CV,
+	DKIM_PARAM_IGNORE
 };
 
 /* Signature methods */
@@ -248,6 +249,7 @@ static const dkim_parse_param_f parser_funcs[] = {
 	[DKIM_PARAM_BODYLENGTH] = rspamd_dkim_parse_bodylength,
 	[DKIM_PARAM_IDX] = rspamd_dkim_parse_idx,
 	[DKIM_PARAM_CV] = rspamd_dkim_parse_cv,
+	[DKIM_PARAM_IGNORE] = rspamd_dkim_parse_ignore,
 };
 
 #define DKIM_ERROR dkim_error_quark ()
@@ -872,6 +874,9 @@ rspamd_create_dkim_context (const gchar *sig,
 				case 'z':
 					param = DKIM_PARAM_COPIEDHDRS;
 					break;
+				case 'r':
+					param = DKIM_PARAM_IGNORE;
+					break;
 				default:
 					g_set_error (err,
 						DKIM_ERROR,