Split FORGED_RELAY_MUA_TO_MX to subrule for metas and scored rule; if only scored rule behaves too poorly to publish, the metas break
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1891797 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/sandbox/gbechis/20_misc.cf b/rulesrc/sandbox/gbechis/20_misc.cf
index 2dabd59..134efd2 100644
--- a/rulesrc/sandbox/gbechis/20_misc.cf
+++ b/rulesrc/sandbox/gbechis/20_misc.cf
@@ -54,7 +54,7 @@
score SENDINBLUE_REDIR 2.000 # limit
# tflags SENDINBLUE_REDIR publish
-meta __SENDINBLUE_REDIR_PHISH __SENDINBLUE_REDIR && ( __PDS_FROM_NAME_TO_DOMAIN || FORGED_RELAY_MUA_TO_MX || __TO_IN_SUBJ )
+meta __SENDINBLUE_REDIR_PHISH __SENDINBLUE_REDIR && ( __PDS_FROM_NAME_TO_DOMAIN || __FORGED_RELAY_MUA_TO_MX || __TO_IN_SUBJ )
meta SENDINBLUE_REDIR_PHISH __SENDINBLUE_REDIR_PHISH
describe SENDINBLUE_REDIR_PHISH Redirect URI via Sendinblue + phishing signs
score SENDINBLUE_REDIR_PHISH 3.500 # limit
diff --git a/rulesrc/sandbox/kb/20_header.cf b/rulesrc/sandbox/kb/20_header.cf
index 67904c6..1910106 100644
--- a/rulesrc/sandbox/kb/20_header.cf
+++ b/rulesrc/sandbox/kb/20_header.cf
@@ -10,7 +10,8 @@
# bug 5817 -- Forged Relay, direct MUA to MX
-header FORGED_RELAY_MUA_TO_MX X-Spam-Relays-External =~ /^\[ ip=(?!127)([\d.]+) [^\[]*\[ ip=\1 [^\[]+ helo=(!(?!(?:10|127|169\.254|172\.(?:1[6-9]|2[0-9]|3[01])|192\.168)\.)| )[^\[]+$/
+header __FORGED_RELAY_MUA_TO_MX X-Spam-Relays-External =~ /^\[ ip=(?!127)([\d.]+) [^\[]*\[ ip=\1 [^\[]+ helo=(!(?!(?:10|127|169\.254|172\.(?:1[6-9]|2[0-9]|3[01])|192\.168)\.)| )[^\[]+$/
+meta FORGED_RELAY_MUA_TO_MX __FORGED_RELAY_MUA_TO_MX
# Plus quite a few devel variants and accompanying tests. This mess needs
# cleaning up, probably after re-investigation. See dos/70_bugs.cf for history.
