[SACVS] CVS: spamassassin/lib/Mail/SpamAssassin EvalTests.pm,1.449,1.450

Update of /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin
In directory sc8-pr-cvs1:/tmp/cvs-serv2002/lib/Mail/SpamAssassin

Modified Files:
        EvalTests.pm 
Log Message:
bug 2459: more work on reorganizing auto-whitelist implementation
Bug 2492: MICROSOFT_EXECUTABLE slightly broken


Index: EvalTests.pm
===================================================================
RCS file: 
/cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/EvalTests.pm,v
retrieving revision 1.449
retrieving revision 1.450
diff -b -w -u -d -r1.449 -r1.450
--- EvalTests.pm        23 Sep 2003 21:37:02 -0000      1.449
+++ EvalTests.pm        25 Sep 2003 03:11:01 -0000      1.450
@@ -919,26 +919,7 @@
 sub check_from_in_auto_whitelist {
     my ($self) = @_;
 
-    return unless $self->{main}->{conf}->{use_auto_whitelist};
-
-    if (!defined $self->{main}->{pers_addr_list_factory}) {
-      my $factory;
-      return unless $self->{main}->{conf}->{auto_whitelist_factory};
-      my $type = $self->{main}->{conf}->{auto_whitelist_factory};
-      if ($type =~ /^([_A-Za-z0-9:]+)$/) {
-       $type = $1;
-      }
-      else {
-       warn "illegal auto_whitelist_factory setting\n";
-       return;
-      }
-      eval '
-        require '.$type.';
-        $factory = '.$type.'->new();
-      ';
-      if ($@) { warn $@; undef $factory; }
-      $self->{main}->set_persistent_address_list_factory($factory);
-    }
+    return unless defined $self->{main}->{pers_addr_list_factory};
 
     local $_ = lc $self->get('From:addr');
     return 0 unless /\S/;
@@ -2496,7 +2477,7 @@
       }
     }
     if ($where == 2) {
-      if ($previous =~ /^$/ && /^TVqQAAMAAAAEAAAA/) {
+      if ($previous =~ /^$/ && /^TV[pq]QAAMAAAAEAA[8A]A/) {
        $self->{microsoft_executable} = 1;
       }
       if ($cte =~ /base64/ && $previous =~ /^\s*$/ && /^\s*$/) {



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