[SACVS] CVS: spamassassin/rules 20_head_tests.cf,1.280,1.281 60_whitelist.cf,1.41,1.42

Update of /cvsroot/spamassassin/spamassassin/rules
In directory sc8-pr-cvs1:/tmp/cvs-serv18462/rules

Modified Files:
        20_head_tests.cf 60_whitelist.cf 
Log Message:
bug 2459: reorganize auto-whitelist implementation


Index: 20_head_tests.cf
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/rules/20_head_tests.cf,v
retrieving revision 1.280
retrieving revision 1.281
diff -b -w -u -d -r1.280 -r1.281
--- 20_head_tests.cf    22 Jun 2003 01:20:39 -0000      1.280
+++ 20_head_tests.cf    23 Sep 2003 21:37:03 -0000      1.281
@@ -358,18 +358,6 @@
 header BTAMAIL_HEADER          ALL =~ /\bbtamail\.net\.cn/i
 describe BTAMAIL_HEADER                Header contains an address from 
btamail.net.cn
 
-header USER_IN_BLACKLIST       eval:check_from_in_blacklist()
-describe USER_IN_BLACKLIST     From: address is in the user's black-list
-tflags USER_IN_BLACKLIST        userconf
-
-header USER_IN_WHITELIST       eval:check_from_in_whitelist()
-describe USER_IN_WHITELIST     From: address is in the user's white-list
-tflags USER_IN_WHITELIST        userconf nice
-
-header USER_IN_DEF_WHITELIST   eval:check_from_in_default_whitelist()
-describe USER_IN_DEF_WHITELIST From: address is in the default white-list
-tflags USER_IN_DEF_WHITELIST    userconf nice
-
 # noticed this implied in passing in Dan's CVS messages. ;)  no nonspam hits
 # but only a small number of spam ones, for me.
 header HTML_ALL_CAPS                   Content-Type =~ /TEXT\/HTML/
@@ -398,22 +386,6 @@
 
 header SORTED_RECIPS           eval:sorted_recipients()
 describe SORTED_RECIPS         Recipient list is sorted by address
-
-header USER_IN_BLACKLIST_TO     eval:check_to_in_blacklist()
-describe USER_IN_BLACKLIST_TO   User is listed in 'blacklist_to'
-tflags USER_IN_BLACKLIST_TO     userconf nice
-
-header USER_IN_WHITELIST_TO     eval:check_to_in_whitelist()
-describe USER_IN_WHITELIST_TO   User is listed in 'whitelist_to'
-tflags USER_IN_WHITELIST_TO     userconf nice
-
-header USER_IN_MORE_SPAM_TO     eval:check_to_in_more_spam()
-describe USER_IN_MORE_SPAM_TO   User is listed in 'more_spam_to'
-tflags USER_IN_MORE_SPAM_TO     userconf nice
-
-header USER_IN_ALL_SPAM_TO      eval:check_to_in_all_spam()
-describe USER_IN_ALL_SPAM_TO    User is listed in 'all_spam_to'
-tflags USER_IN_ALL_SPAM_TO      userconf nice
 
 header GAPPY_SUBJECT           Subject =~ /\b(?:[a-z]([-_. 
=~\/:,*!\@\#\$\%\^&+;\"\'<>\\])\1{0,2}){4,}/i
 describe GAPPY_SUBJECT         Subject: contains G.a.p.p.y-T.e.x.t

Index: 60_whitelist.cf
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/rules/60_whitelist.cf,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -w -u -d -r1.41 -r1.42
--- 60_whitelist.cf     10 Jun 2003 05:06:37 -0000      1.41
+++ 60_whitelist.cf     23 Sep 2003 21:37:03 -0000      1.42
@@ -11,7 +11,44 @@
 #
 # See the file "License" in the top level of the SpamAssassin source
 # distribution for more details.
-#
+
+
+###########################################################################
+# Whitelist rules
+
+# note: the test name is hard-coded several places, change everywhere
+header AWL                     eval:check_from_in_auto_whitelist()
+describe AWL                   From: address is in the auto white-list
+tflags AWL                     userconf noautolearn
+
+header USER_IN_BLACKLIST       eval:check_from_in_blacklist()
+describe USER_IN_BLACKLIST     From: address is in the user's black-list
+tflags USER_IN_BLACKLIST       userconf
+
+header USER_IN_WHITELIST       eval:check_from_in_whitelist()
+describe USER_IN_WHITELIST     From: address is in the user's white-list
+tflags USER_IN_WHITELIST       userconf nice
+
+header USER_IN_DEF_WHITELIST   eval:check_from_in_default_whitelist()
+describe USER_IN_DEF_WHITELIST From: address is in the default white-list
+tflags USER_IN_DEF_WHITELIST   userconf nice noautolearn
+
+header USER_IN_BLACKLIST_TO     eval:check_to_in_blacklist()
+describe USER_IN_BLACKLIST_TO   User is listed in 'blacklist_to'
+tflags USER_IN_BLACKLIST_TO     userconf nice
+
+header USER_IN_WHITELIST_TO     eval:check_to_in_whitelist()
+describe USER_IN_WHITELIST_TO   User is listed in 'whitelist_to'
+tflags USER_IN_WHITELIST_TO     userconf nice
+
+header USER_IN_MORE_SPAM_TO     eval:check_to_in_more_spam()
+describe USER_IN_MORE_SPAM_TO   User is listed in 'more_spam_to'
+tflags USER_IN_MORE_SPAM_TO     userconf nice
+
+header USER_IN_ALL_SPAM_TO      eval:check_to_in_all_spam()
+describe USER_IN_ALL_SPAM_TO    User is listed in 'all_spam_to'
+tflags USER_IN_ALL_SPAM_TO      userconf nice
+
 ###########################################################################
 # Default whitelists.  These should be addresses which send mail that is often
 # tagged (incorrectly) as spam; it also helps that they be addresses of big



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf