Mailing List Archive

Author: dos
Date: Mon Aug 28 15:27:31 2006
New Revision: 437866

URL: http://svn.apache.org/viewvc?rev=437866&view=rev
Log:
bug 5065: add config for whitelist_from_dk to 3.1 updates

Added:
spamassassin/rules/branches/3.1/60_whitelist_dk.cf
- copied, changed from r437863, spamassassin/branches/3.1/rules/60_whitelist_dk.cf
Modified:
spamassassin/rules/branches/3.1/50_scores.cf

Modified: spamassassin/rules/branches/3.1/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/branches/3.1/50_scores.cf?rev=437866&r1=437865&r2=437866&view=diff
==============================================================================
--- spamassassin/rules/branches/3.1/50_scores.cf (original)
+++ spamassassin/rules/branches/3.1/50_scores.cf Mon Aug 28 15:27:31 2006
@@ -690,6 +690,14 @@
score ENV_AND_HDR_DKIM_MATCH -7.500
endif # Mail::SpamAssassin::Plugin::DKIM

+if (version > 3.001004)
+ifplugin Mail::SpamAssassin::Plugin::DomainKeys
+score USER_IN_DK_WHITELIST -100.000
+score USER_IN_DEF_DK_WL -7.500
+score ENV_AND_HDR_DK_MATCH -7.500
+endif # Mail::SpamAssassin::Plugin::DomainKeys
+endif # if (version > 3.001004)
+
ifplugin Mail::SpamAssassin::Plugin::SPF
score USER_IN_SPF_WHITELIST -100.000
score USER_IN_DEF_SPF_WL -7.500

Copied: spamassassin/rules/branches/3.1/60_whitelist_dk.cf (from r437863, spamassassin/branches/3.1/rules/60_whitelist_dk.cf)
URL: http://svn.apache.org/viewvc/spamassassin/rules/branches/3.1/60_whitelist_dk.cf?p2=spamassassin/rules/branches/3.1/60_whitelist_dk.cf&p1=spamassassin/branches/3.1/rules/60_whitelist_dk.cf&r1=437863&r2=437866&rev=437866&view=diff
==============================================================================
--- spamassassin/branches/3.1/rules/60_whitelist_dk.cf (original)
+++ spamassassin/rules/branches/3.1/60_whitelist_dk.cf Mon Aug 28 15:27:31 2006
@@ -24,6 +24,8 @@
###########################################################################
# DK whitelist rules

+if (version > 3.001004) # DK based whitelist first available in 3.1.5
+
ifplugin Mail::SpamAssassin::Plugin::DomainKeys

header USER_IN_DK_WHITELIST eval:check_for_dk_whitelist_from()
@@ -55,3 +57,5 @@


endif # Mail::SpamAssassin::Plugin::DomainKeys
+
+endif # if (version > 3.001004)