From: Andrew Lewis <nerf@judo.za.org>
Date: Fri, 23 Jun 2017 19:11:53 +0000 (+0200)
Subject: [Minor] Milter headers: s/x-spam-flag/x-spam/
X-Git-Tag: 1.6.2~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70a20719f6ca31d001a3e652818b2a9f1cbbc99e;p=thirdparty%2Frspamd.git

[Minor] Milter headers: s/x-spam-flag/x-spam/
---

diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index d568a8fe32..bdf246a5ae 100644
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -39,8 +39,8 @@ local settings = {
       header = 'X-Spamd-Result',
       remove = 1,
     },
-    ['x-spam-flag'] = {
-      header = 'X-Spam-Flag',
+    ['x-spam'] = {
+      header = 'X-Spam',
       remove = 1,
       value = 'Yes',
     },
@@ -259,8 +259,8 @@ 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-flag'] = function()
-    spam_header('x-spam-flag', settings.routines['x-spam-flag'].header, settings.routines['x-spam-flag'].value, settings.routines['x-spam-flag'].remove)
+  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()
@@ -399,7 +399,7 @@ 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-flag')
+  activate_routine('x-spam')
 end
 if type(opts['use']) == 'string' then
   opts['use'] = {opts['use']}