From 20a0c4409bda5b135a2532b57403c1cf94ab1668 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 26 Jan 2021 13:23:37 +0100
Subject: [PATCH 1/2] - add default setting for unused spam tag method

---
 server/conf/rspamd_users.inc.conf.master | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/conf/rspamd_users.inc.conf.master b/server/conf/rspamd_users.inc.conf.master
index 96ba9f0838..85cb19a944 100644
--- a/server/conf/rspamd_users.inc.conf.master
+++ b/server/conf/rspamd_users.inc.conf.master
@@ -38,9 +38,11 @@
 		actions {
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='rewrite_subject'>
 			"rewrite subject" =  <tmpl_var name='rspamd_spam_tag_level'>;
+			"add header" = null
 		</tmpl_if>
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='add_header'>
 			"add header" =  <tmpl_var name='rspamd_spam_tag_level'>;
+			"rewrite subject" = null
 		</tmpl_if>
 			reject = <tmpl_var name='rspamd_spam_kill_level'>;
 	<tmpl_if name='greylisting'>
-- 
GitLab


From 733b16868d68c634241f84deccce5b33bc387b2a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 26 Jan 2021 13:24:44 +0100
Subject: [PATCH 2/2] - missing semicolon

---
 server/conf/rspamd_users.inc.conf.master | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/conf/rspamd_users.inc.conf.master b/server/conf/rspamd_users.inc.conf.master
index 85cb19a944..83dd5b2764 100644
--- a/server/conf/rspamd_users.inc.conf.master
+++ b/server/conf/rspamd_users.inc.conf.master
@@ -38,11 +38,11 @@
 		actions {
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='rewrite_subject'>
 			"rewrite subject" =  <tmpl_var name='rspamd_spam_tag_level'>;
-			"add header" = null
+			"add header" = null;
 		</tmpl_if>
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='add_header'>
 			"add header" =  <tmpl_var name='rspamd_spam_tag_level'>;
-			"rewrite subject" = null
+			"rewrite subject" = null;
 		</tmpl_if>
 			reject = <tmpl_var name='rspamd_spam_kill_level'>;
 	<tmpl_if name='greylisting'>
-- 
GitLab