You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by da...@apache.org on 2018/01/28 16:03:13 UTC

svn commit: r1822467 - /spamassassin/branches/3.4/rules/20_head_tests.cf

Author: davej
Date: Sun Jan 28 16:03:13 2018
New Revision: 1822467

URL: http://svn.apache.org/viewvc?rev=1822467&view=rev
Log:
Bug 6946.

Modified:
    spamassassin/branches/3.4/rules/20_head_tests.cf

Modified: spamassassin/branches/3.4/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/20_head_tests.cf?rev=1822467&r1=1822466&r2=1822467&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/20_head_tests.cf (original)
+++ spamassassin/branches/3.4/rules/20_head_tests.cf Sun Jan 28 16:03:13 2018
@@ -253,10 +253,10 @@ header FORGED_TELESP_RCVD	Received =~ /\
 describe FORGED_TELESP_RCVD	Contains forged hostname for a DSL IP in Brazil
 
 # forgery meta-rules: more reliable than their inputs
-meta CONFIRMED_FORGED		(__FORGED_RCVD_TRAIL && (__FORGED_AOL_RCVD || __FORGED_HOTMAIL_RCVD || __FORGED_EUDORAMAIL_RCVD || FORGED_YAHOO_RCVD || __FORGED_JUNO_RCVD))
+meta CONFIRMED_FORGED		(__FORGED_RCVD_TRAIL && (__FORGED_AOL_RCVD || __FORGED_HOTMAIL_RCVD || __FORGED_EUDORAMAIL_RCVD || FORGED_YAHOO_RCVD || __FORGED_JUNO_RCVD || FORGED_GMAIL_RCVD))
 describe CONFIRMED_FORGED	Received headers are forged
 
-meta MULTI_FORGED		((__FORGED_AOL_RCVD + __FORGED_HOTMAIL_RCVD + __FORGED_EUDORAMAIL_RCVD + FORGED_YAHOO_RCVD + __FORGED_JUNO_RCVD) > 1)
+meta MULTI_FORGED		((__FORGED_AOL_RCVD + __FORGED_HOTMAIL_RCVD + __FORGED_EUDORAMAIL_RCVD + FORGED_YAHOO_RCVD + __FORGED_JUNO_RCVD + FORGED_GMAIL_RCVD) > 1)
 describe MULTI_FORGED		Received headers indicate multiple forgeries
 
 header NONEXISTENT_CHARSET	Content-Type =~ /charset=.?DEFAULT/
@@ -476,7 +476,10 @@ header __FORGED_EUDORAMAIL_RCVD	eval:che
 header FORGED_YAHOO_RCVD	eval:check_for_forged_yahoo_received_headers()
 describe FORGED_YAHOO_RCVD	'From' yahoo.com does not match 'Received' headers
 
-header __FORGED_JUNO_RCVD		eval:check_for_forged_juno_received_headers()
+header FORGED_GMAIL_RCVD	eval:check_for_forged_gmail_received_headers()
+describe FORGED_GMAIL_RCVD	'From' gmail.com does not match 'Received' headers
+
+header __FORGED_JUNO_RCVD	eval:check_for_forged_juno_received_headers()