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/09/24 14:17:06 UTC

svn commit: r578778 - /spamassassin/branches/3.2/rules/20_dynrdns.cf

Author: jm
Date: Mon Sep 24 05:17:05 2007
New Revision: 578778

URL: http://svn.apache.org/viewvc?rev=578778&view=rev
Log:
bug 5586: RDNS_NONE has false positives if the MTA doesn't put the hostname in the Received header, like Communigate Pro. add an exception for this

Modified:
    spamassassin/branches/3.2/rules/20_dynrdns.cf

Modified: spamassassin/branches/3.2/rules/20_dynrdns.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.2/rules/20_dynrdns.cf?rev=578778&r1=578777&r2=578778&view=diff
==============================================================================
--- spamassassin/branches/3.2/rules/20_dynrdns.cf (original)
+++ spamassassin/branches/3.2/rules/20_dynrdns.cf Mon Sep 24 05:17:05 2007
@@ -189,13 +189,17 @@
 # exceptions (bug 5397):
 header  __RDNS_STATIC         X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns=\S*(?:static|fixip)/i
 
+# bug 5586:
+header __CGATE_RCVD       Received =~ /by \S+ \(CommuniGate Pro/
+
+header RDNS_NONE    X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns= /
+
 ###########################################################################
 
 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))
 
 describe RDNS_DYNAMIC Delivered to trusted network by host with dynamic-looking rDNS
 
-header RDNS_NONE    X-Spam-Relays-Untrusted =~ /^[^\]]+ rdns= /
+meta RDNS_NONE      (__RDNS_NONE && !__CGATE_RCVD)
 describe RDNS_NONE  Delivered to trusted network by a host with no rDNS
-