You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2012/12/10 20:26:35 UTC

svn commit: r1419685 - /spamassassin/trunk/rules/20_fake_helo_tests.cf

Author: kmcgrail
Date: Mon Dec 10 19:26:34 2012
New Revision: 1419685

URL: http://svn.apache.org/viewvc?rev=1419685&view=rev
Log:
Tweak for bug 6874

Modified:
    spamassassin/trunk/rules/20_fake_helo_tests.cf

Modified: spamassassin/trunk/rules/20_fake_helo_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_fake_helo_tests.cf?rev=1419685&r1=1419684&r2=1419685&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_fake_helo_tests.cf (original)
+++ spamassassin/trunk/rules/20_fake_helo_tests.cf Mon Dec 10 19:26:34 2012
@@ -127,7 +127,8 @@ describe HELO_DYNAMIC_SPLIT_IP Relay HEL
 # 113x35x70x11.ap113.ftth.ucom.ne.jp [113.35.70.11]
 # 98x9x3p5siouq.kvknv3sv1quk.3ejp4xzv.com [213.250.20.156]
 # 1.0/24.137.95.202.in-addr.arpa [202.95.137.1]
-header HELO_DYNAMIC_IPADDR2 X-Spam-Relays-External =~ /^[^\]]+ helo=\d{1,3}(?:[\Wx_]\d{1,3}){3}[^\d\s][^\s.]*\.\S+\.\S+[^\]]+ auth= /i
+header __HELO_DYNAMIC_IPADDR2 X-Spam-Relays-External =~ /^[^\]]+ helo=\d{1,3}(?:[\Wx_]\d{1,3}){3}[^\d\s][^\s.]*\.\S+\.\S+[^\]]+ auth= /i
+meta HELO_DYNAMIC_IPADDR2  (__HELO_DYNAMIC_IPADDR2 && !HELO_DYNAMIC_SPLIT_IP)
 describe HELO_DYNAMIC_IPADDR2 Relay HELO'd using suspicious hostname (IP addr 2)
 
 # h234n2fls32o895.telia.com [217.208.73.234]