]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Core: Do not include full urls in output unless asked
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 10 Jan 2019 15:47:30 +0000 (15:47 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 10 Jan 2019 15:47:30 +0000 (15:47 +0000)
src/libserver/protocol.c

index 45051ce513459d8b6aad52d83cb57d319d1eaad8..35463be525a7b922983af8430d64585c3318eee7 100644 (file)
@@ -1154,13 +1154,16 @@ rspamd_protocol_write_ucl (struct rspamd_task *task,
        }
 
        if (flags & RSPAMD_PROTOCOL_URLS) {
-               if (task->cfg->log_urls || (task->flags & RSPAMD_TASK_FLAG_EXT_URLS)) {
+               if (task->flags & RSPAMD_TASK_FLAG_EXT_URLS) {
                        if (g_hash_table_size (task->urls) > 0) {
-                               ucl_object_insert_key (top, rspamd_urls_tree_ucl (task->urls,
-                                               task), "urls", 0, false);
+                               ucl_object_insert_key (top,
+                                               rspamd_urls_tree_ucl (task->urls, task),
+                                               "urls", 0, false);
                        }
+
                        if (g_hash_table_size (task->emails) > 0) {
-                               ucl_object_insert_key (top, rspamd_emails_tree_ucl (task->emails, task),
+                               ucl_object_insert_key (top,
+                                               rspamd_emails_tree_ucl (task->emails, task),
                                                "emails", 0, false);
                        }
                }