You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2016/01/26 18:09:26 UTC
svn commit: r1726846 -
/spamassassin/trunk/rulesrc/sandbox/maddoc/99_doc_test.cf
Author: jhardin
Date: Tue Jan 26 17:09:25 2016
New Revision: 1726846
URL: http://svn.apache.org/viewvc?rev=1726846&view=rev
Log:
FSL_HELO_BARE_IP_2: Bug 7292, tweaking per discussion on users list
Modified:
spamassassin/trunk/rulesrc/sandbox/maddoc/99_doc_test.cf
Modified: spamassassin/trunk/rulesrc/sandbox/maddoc/99_doc_test.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/maddoc/99_doc_test.cf?rev=1726846&r1=1726845&r2=1726846&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/maddoc/99_doc_test.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/maddoc/99_doc_test.cf Tue Jan 26 17:09:25 2016
@@ -100,7 +100,7 @@ meta FSL_STACKED_TEXT (__TWO_WORD_LIN
# SMF: FP avoidance
# JHardin: don't hit 127.x.x.x (loopback) addresses
header __FSL_HELO_BARE_IP_1 X-Spam-Relays-External =~ /^[^\]]+ helo=(?!127)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} /i
-meta FSL_HELO_BARE_IP_1 __FSL_HELO_BARE_IP_1 && !FSL_HELO_BARE_IP_2
+meta FSL_HELO_BARE_IP_1 __FSL_HELO_BARE_IP_1
# score FSL_HELO_BARE_IP_1 0.001
@@ -109,8 +109,8 @@ meta FSL_HELO_BARE_IP_1 __FSL_
# score limit due to partial overlap with RCVD_NUMERIC_HELO
# JHardin: don't hit 127.x.x.x (loopback) addresses
header __FSL_HELO_BARE_IP_2 X-Spam-Relays-External =~ /helo=(?!127)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} /i
-meta FSL_HELO_BARE_IP_2 __FSL_HELO_BARE_IP_2 && !__VIA_ML && !__HAS_ERRORS_TO
-score FSL_HELO_BARE_IP_2 2.000
+meta FSL_HELO_BARE_IP_2 __FSL_HELO_BARE_IP_2 && !ALL_TRUSTED && !FSL_HELO_BARE_IP_1 && !__VIA_ML && !__HAS_ERRORS_TO
+score FSL_HELO_BARE_IP_2 1.500
header FSL_HELO_NON_FQDN_1 X-Spam-Relays-External =~ /^[^\]]+ helo=[a-zA-Z0-9-_]+ /i
# score FSL_HELO_NON_FQDN_1 0.001