diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/dkim_check.c | 8 | ||||
| -rw-r--r-- | src/plugins/spf.c | 9 | ||||
| -rw-r--r-- | src/plugins/surbl.c | 14 |
3 files changed, 9 insertions, 22 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index 71214b2bc..5d30cdcb3 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -616,8 +616,8 @@ dkim_module_check (struct dkim_check_result *res) if (all_done) { DL_FOREACH (first, cur) { const gchar *symbol = NULL; - GList *messages = NULL; int symbol_weight = 1; + if (cur->ctx == NULL) { continue; } @@ -635,14 +635,12 @@ dkim_module_check (struct dkim_check_result *res) else if (cur->res == DKIM_TRYAGAIN) { symbol = dkim_module_ctx->symbol_tempfail; } + if (symbol != NULL) { - messages = g_list_prepend (messages, - rspamd_mempool_strdup (cur->task->task_pool, - rspamd_dkim_get_domain (cur->ctx))); rspamd_task_insert_result (cur->task, symbol, symbol_weight, - messages); + rspamd_dkim_get_domain (cur->ctx)); } } rspamd_session_watcher_pop (res->task->s, res->w); diff --git a/src/plugins/spf.c b/src/plugins/spf.c index 98ca09c37..d7b76e003 100644 --- a/src/plugins/spf.c +++ b/src/plugins/spf.c @@ -347,7 +347,6 @@ spf_check_element (struct spf_resolved *rec, struct spf_addr *addr, gchar *spf_result; guint af, mask, bmask, addrlen; const gchar *spf_message, *spf_symbol; - GList *opts = NULL; if (task->from_addr == NULL) { return FALSE; @@ -406,7 +405,6 @@ spf_check_element (struct spf_resolved *rec, struct spf_addr *addr, if (res) { spf_result = rspamd_mempool_alloc (task->task_pool, strlen (addr->spf_string) + 2); - opts = g_list_prepend (opts, spf_result); switch (addr->mech) { case SPF_FAIL: @@ -464,7 +462,7 @@ spf_check_element (struct spf_resolved *rec, struct spf_addr *addr, rspamd_task_insert_result (task, spf_symbol, 1, - opts); + spf_result); ucl_object_insert_key (task->messages, ucl_object_fromstring (spf_message), "spf", 0, false); @@ -575,15 +573,12 @@ spf_symbol_callback (struct rspamd_task *task, void *unused) w = rspamd_session_get_watcher (task->s); if (!rspamd_spf_resolve (task, spf_plugin_callback, w)) { - GList *opts = NULL; - - opts = g_list_prepend (opts, "(SPF): spf DNS fail"); msg_info_task ("cannot make spf request for [%s]", task->message_id); rspamd_task_insert_result (task, spf_module_ctx->symbol_dnsfail, 1, - opts); + "(SPF): spf DNS fail"); } else { rspamd_session_watcher_push (task->s); diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c index 6dea0b939..32c002d96 100644 --- a/src/plugins/surbl.c +++ b/src/plugins/surbl.c @@ -1137,9 +1137,7 @@ process_dns_results (struct rspamd_task *task, task->message_id, url, suffix->suffix, bit->bit); - rspamd_task_insert_result (task, bit->symbol, 1, - g_list_prepend (NULL, - rspamd_mempool_strdup (task->task_pool, url))); + rspamd_task_insert_result (task, bit->symbol, 1, url); got_result = TRUE; } } @@ -1158,9 +1156,7 @@ process_dns_results (struct rspamd_task *task, task->message_id, url, suffix->suffix, bit->bit); - rspamd_task_insert_result (task, bit->symbol, 1, - g_list_prepend (NULL, - rspamd_mempool_strdup (task->task_pool, url))); + rspamd_task_insert_result (task, bit->symbol, 1, url); } } } @@ -1170,9 +1166,7 @@ process_dns_results (struct rspamd_task *task, msg_info_task ("<%s> domain [%s] is in surbl %s", task->message_id, url, suffix->suffix); - rspamd_task_insert_result (task, suffix->symbol, 1, - g_list_prepend (NULL, - rspamd_mempool_strdup (task->task_pool, url))); + rspamd_task_insert_result (task, suffix->symbol, 1, url); } else { ina.s_addr = addr; @@ -1456,7 +1450,7 @@ surbl_tree_url_callback (gpointer key, gpointer value, void *data) rspamd_task_insert_result (param->task, surbl_module_ctx->redirector_symbol, 1, - g_list_prepend (NULL, found_tld)); + found_tld); } register_redirector_call (url, |