diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-04-02 13:35:59 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-04-02 13:35:59 +0100 |
| commit | 747185e0cd527619eca9bf14ad6f72c8de79b898 (patch) | |
| tree | 5bbdfceaa6c8819b8c201f0dcbb8cd015ca01b42 | |
| parent | 217b09ebc6a126aed0807eb54b334ddb7d0768c0 (diff) | |
| parent | 7e639ed1083c838d6d331493ab830a7e26f15c3b (diff) | |
| download | rspamd-747185e0cd527619eca9bf14ad6f72c8de79b898.tar.gz rspamd-747185e0cd527619eca9bf14ad6f72c8de79b898.zip | |
Merge pull request #579 from fatalbanana/master
Whitelist fixes
| -rw-r--r-- | conf/modules.d/whitelist.conf | 1 | ||||
| -rw-r--r-- | src/plugins/lua/whitelist.lua | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf index 13013ff53..f1d1ab56a 100644 --- a/conf/modules.d/whitelist.conf +++ b/conf/modules.d/whitelist.conf @@ -39,7 +39,6 @@ whitelist { description = "Mail comes from the whitelisted domain and has valid SPF and DKIM policies"; } "WHITELIST_DMARC" = { - valid_dkim = true; valid_dmarc = true; domains = "${CONFDIR}/dmarc_whitelist.inc"; score = -7.0; diff --git a/src/plugins/lua/whitelist.lua b/src/plugins/lua/whitelist.lua index 31fd6251b..202d85465 100644 --- a/src/plugins/lua/whitelist.lua +++ b/src/plugins/lua/whitelist.lua @@ -95,7 +95,7 @@ local function whitelist_cb(symbol, rule, task) local dkim_opts = sym[1]['options'] if dkim_opts then - each(function(i, val) + each(function(val) if not found then local tld = rspamd_util.get_tld(val) |