You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/07/30 14:53:12 UTC
svn commit: r560954 - /spamassassin/trunk/rules/20_dynrdns.cf
Author: jm
Date: Mon Jul 30 05:53:10 2007
New Revision: 560954
URL: http://svn.apache.org/viewvc?view=rev&rev=560954
Log:
bug 5397: RDNS_DYNAMIC should never fire on a PTR with 'static' in it; thanks to Martin Blapp <mbr at freebsd.org>
Modified:
spamassassin/trunk/rules/20_dynrdns.cf
Modified: spamassassin/trunk/rules/20_dynrdns.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dynrdns.cf?view=diff&rev=560954&r1=560953&r2=560954
==============================================================================
--- spamassassin/trunk/rules/20_dynrdns.cf (original)
+++ spamassassin/trunk/rules/20_dynrdns.cf Mon Jul 30 05:53:10 2007
@@ -190,11 +190,14 @@
# i253064.ppp.asahi-net.or.jp
# u035201.ppp.asahi-net.or.jp
# w158034.ppp.asahi-net.or.jp
-header __RDNS_DYNAMIC_ASAHI X-Spam-Relays-Untrusted =~ /^[^\]]+ [a-z][0-9]+\.ppp\.asahi-net\.or\.jp/i
+header __RDNS_DYNAMIC_ASAHI X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=[a-z][0-9]+\.ppp\.asahi-net\.or\.jp/i
+
+# exceptions (bug 5397):
+header __RDNS_STATIC X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=\S*(?:static|fixip)/i
###########################################################################
-meta RDNS_DYNAMIC (__LAST_UNTRUSTED_RELAY_NO_AUTH && (__RDNS_DYNAMIC_IPADDR || __RDNS_DYNAMIC_DHCP || __RDNS_DYNAMIC_HCC || __RDNS_DYNAMIC_ATTBI || __RDNS_DYNAMIC_ROGERS || __RDNS_DYNAMIC_ADELPHIA || __RDNS_DYNAMIC_DIALIN || __RDNS_DYNAMIC_HEXIP || __RDNS_DYNAMIC_SPLIT_IP || __RDNS_DYNAMIC_YAHOOBB || __RDNS_DYNAMIC_OOL || __RDNS_DYNAMIC_RR2 || __RDNS_DYNAMIC_COMCAST || __RDNS_DYNAMIC_TELIA || __RDNS_DYNAMIC_VTR || __RDNS_DYNAMIC_CHELLO_NO || __RDNS_DYNAMIC_CHELLO_NL || __RDNS_DYNAMIC_VELOX || __RDNS_DYNAMIC_NTL || __RDNS_DYNAMIC_HOME_NL || __RDNS_DYNAMIC_TDS || __RDNS_DYNAMIC_VIRTUA || __RDNS_DYNAMIC_SPACELAN || __RDNS_INDICATOR_DYN || __RDNS_INDICATOR_RES || __RDNS_INDICATOR_TYPE2 || __RDNS_DYNAMIC_TTNET || __RDNS_DYNAMIC_ASAHI))
+meta RDNS_DYNAMIC (__LAST_UNTRUSTED_RELAY_NO_AUTH && !__RDNS_STATIC && (__RDNS_DYNAMIC_IPADDR || __RDNS_DYNAMIC_DHCP || __RDNS_DYNAMIC_HCC || __RDNS_DYNAMIC_ATTBI || __RDNS_DYNAMIC_ROGERS || __RDNS_DYNAMIC_ADELPHIA || __RDNS_DYNAMIC_DIALIN || __RDNS_DYNAMIC_HEXIP || __RDNS_DYNAMIC_SPLIT_IP || __RDNS_DYNAMIC_YAHOOBB || __RDNS_DYNAMIC_OOL || __RDNS_DYNAMIC_RR2 || __RDNS_DYNAMIC_COMCAST || __RDNS_DYNAMIC_TELIA || __RDNS_DYNAMIC_VTR || __RDNS_DYNAMIC_CHELLO_NO || __RDNS_DYNAMIC_CHELLO_NL || __RDNS_DYNAMIC_VELOX || __RDNS_DYNAMIC_NTL || __RDNS_DYNAMIC_HOME_NL || __RDNS_DYNAMIC_TDS || __RDNS_DYNAMIC_VIRTUA || __RDNS_DYNAMIC_SPACELAN || __RDNS_INDICATOR_DYN || __RDNS_INDICATOR_RES || __RDNS_INDICATOR_TYPE2 || __RDNS_DYNAMIC_TTNET || __RDNS_DYNAMIC_ASAHI))
describe RDNS_DYNAMIC Delivered to trusted network by host with dynamic-looking rDNS
header RDNS_NONE X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns= /