]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Remove `skip_multi` from DKIM module
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 5 Jun 2017 13:13:46 +0000 (14:13 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 5 Jun 2017 13:13:46 +0000 (14:13 +0100)
src/plugins/dkim_check.c

index 4009662bff8498c9c9991152abcca56c22d49842..e46de136c6502a498483b5f348e694213c1afcf1 100644 (file)
@@ -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;
 };
@@ -254,15 +252,6 @@ dkim_module_init (struct rspamd_config *cfg, struct module_ctx **ctx)
                        0,
                        NULL,
                        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",
@@ -457,14 +446,6 @@ dkim_module_config (struct rspamd_config *cfg)
                dkim_module_ctx->trusted_only = FALSE;
        }
 
-       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) {