Diff of /spamassassin/branches/3.0/lib/Mail/SpamAssassin/EvalTests.pm

Parent Directory | Revision Log | Patch

--- spamassassin/branches/3.0/lib/Mail/SpamAssassin/EvalTests.pm	2005/04/26 21:56:22	164897
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin/EvalTests.pm	2005/04/26 22:06:29	164898
@@ -1351,20 +1351,10 @@ sub check_rbl_results_for {
   check_rbl_sub(@_);
 }
 
-# Check a RBL if a message is Habeas SWE.
-#	Test is skipped if the SWE 2.0 "Reputation Tag" is matched in the
-#	Envelope From address.  Otherwise transitional senders would get a
-#	double bonus.  <csg@habeas.com>
-#
+# check a RBL if a message is Habeas SWE
 sub check_rbl_swe {
   my ($self, $rule, $set, $rbl_server, $subtest) = @_;
 
-  if (!defined $self->{envelope_accreditor_tag}) {
-    $self->message_envelope_accreditor_tag();
-  }
-  if ($self->{envelope_accreditor_tag}) {
-    return 0;
-  }
   if (!defined $self->{habeas_swe}) {
     $self->message_is_habeas_swe();
   }
@@ -1374,22 +1364,6 @@ sub check_rbl_swe {
   return 0;
 }
 
-# check an RBL if "--accreditor" tag is in Envelope From.
-#	<csg@habeas.com>
-#
-sub check_rbl_accreditor {
-  my ($self, $rule, $set, $rbl_server, $subtest, $accreditor) = @_;
-
-  if (!defined $self->{envelope_accreditor_tag}) {
-    $self->message_envelope_accreditor_tag();
-  }
-  if ($self->{envelope_accreditor_tag} eq $accreditor) {
-    $self->check_rbl_backend($rule, $set, $rbl_server, 'A', $subtest);
-  }
-  return 0;
-}
-
-
 # this only checks the address host name and not the domain name because
 # using the domain name had much worse results for dsn.rfc-ignorant.org
 sub check_rbl_from_host {
@@ -2144,16 +2118,6 @@ sub message_is_habeas_swe {
   return $self->{habeas_swe};
 }
 
-sub message_envelope_accreditor_tag {
-  my ($self) = @_;
-
-  if ($self->get('EnvelopeFrom:addr') =~ /[@.]a--([a-z0-9]{3,})\./i) {
-    ($self->{envelope_accreditor_tag} = $1) =~ tr/A-Z/a-z/;
-    return;
-  }
-  $self->{envelope_accreditor_tag} = "";
-}
-
 ###########################################################################
 # BODY TESTS:
 ###########################################################################