diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-06-05 14:13:46 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-06-05 14:13:46 +0100 |
| commit | 5d55f0179c6c6b1655e174a4f30f8396bcea8cd7 (patch) | |
| tree | 52458724d6ad73ba585d816f549f87f7650cecd0 /src | |
| parent | 27ba32e8c92633aceb4d3b865fd485f4b7f086db (diff) | |
| download | rspamd-5d55f0179c6c6b1655e174a4f30f8396bcea8cd7.tar.gz rspamd-5d55f0179c6c6b1655e174a4f30f8396bcea8cd7.zip | |
[Minor] Remove `skip_multi` from DKIM module
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/dkim_check.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index 4009662bf..e46de136c 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -27,7 +27,6 @@ * - strict_multiplier (number): multiplier for strict domains * - time_jitter (number): jitter in seconds to allow time diff while checking * - trusted_only (flag): check signatures only for domains in 'domains' map - * - skip_mutli (flag): skip messages with multiply dkim signatures */ @@ -77,7 +76,6 @@ struct dkim_ctx { gint sign_condition_ref; guint max_sigs; gboolean trusted_only; - gboolean skip_multi; gboolean check_local; gboolean check_authed; }; @@ -256,15 +254,6 @@ dkim_module_init (struct rspamd_config *cfg, struct module_ctx **ctx) 0); rspamd_rcl_add_doc_by_path (cfg, "dkim", - "Do not check messages with multiple DKIM signatures", - "skip_multi", - UCL_BOOLEAN, - NULL, - 0, - NULL, - 0); - rspamd_rcl_add_doc_by_path (cfg, - "dkim", "Lua script that tells if a message should be signed and with what params", "sign_condition", UCL_STRING, @@ -458,14 +447,6 @@ dkim_module_config (struct rspamd_config *cfg) } if ((value = - rspamd_config_get_module_opt (cfg, "dkim", "skip_multi")) != NULL) { - dkim_module_ctx->skip_multi = ucl_object_toboolean (value); - } - else { - dkim_module_ctx->skip_multi = FALSE; - } - - if ((value = rspamd_config_get_module_opt (cfg, "dkim", "sign_headers")) != NULL) { dkim_module_ctx->sign_headers = ucl_object_tostring (value); } @@ -1049,15 +1030,6 @@ dkim_symbol_callback (struct rspamd_task *task, void *unused) DL_APPEND (res, cur); } - if (dkim_module_ctx->skip_multi) { - if (hlist->len > 1) { - msg_info_task ("message has multiple signatures but we" - " check only one as 'skip_multi' is set"); - } - - break; - } - checked ++; if (checked > dkim_module_ctx->max_sigs) { |