From: Andrew Lewis <nerf@judo.za.org>
Date: Sat, 24 Jun 2017 12:05:59 +0000 (+0200)
Subject: [Minor] Milter headers: remove x-spam; fix misprint
X-Git-Tag: 1.6.2~79
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=43fb72efd04c4d5985aeec4dbae4a01dba855593;p=rspamd.git

[Minor] Milter headers: remove x-spam; fix misprint
---

diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index 4ee674ddc..dcf8e9ffd 100644
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -42,11 +42,6 @@ local settings = {
       header = 'X-Spamd-Result',
       remove = 1,
     },
-    ['x-spam'] = {
-      header = 'X-Spam',
-      remove = 1,
-      value = 'Yes',
-    },
     ['x-rspamd-server'] = {
       header = 'X-Rspamd-Server',
       remove = 1,
@@ -201,7 +196,7 @@ local function milter_headers(task)
 
   routines['remove-header'] = function()
     if skip_wanted('remove-header') then return end
-    if settings.routines['remove-header'].header and settings.routines['x-rspamd-server'].remove then
+    if settings.routines['remove-header'].header and settings.routines['remove-header'].remove then
       remove[settings.routines['remove-header'].header] = settings.routines['remove-header'].remove
     end
   end
@@ -269,10 +264,6 @@ local function milter_headers(task)
     spam_header('spam-header', settings.routines['spam-header'].header, settings.routines['spam-header'].value, settings.routines['spam-header'].remove)
   end
 
-  routines['x-spam'] = function()
-    spam_header('x-spam', settings.routines['x-spam'].header, settings.routines['x-spam'].value, settings.routines['x-spam'].remove)
-  end
-
   routines['x-virus'] = function()
     if skip_wanted('x-virus') then return end
     if not common.symbols then
@@ -409,7 +400,6 @@ if opts['extended_spam_headers'] then
   activate_routine('x-spamd-result')
   activate_routine('x-rspamd-server')
   activate_routine('x-rspamd-queue-id')
-  activate_routine('x-spam')
 end
 if type(opts['use']) == 'string' then
   opts['use'] = {opts['use']}