You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/10/31 21:23:23 UTC

svn commit: rev 56149 - spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin

Author: felicity
Date: Sun Oct 31 12:23:22 2004
New Revision: 56149

Modified:
   spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Log:
bug 3930: uridnsbl plugin didn't respect the uridnsbl_max_domains value, nor did it allow it as a configuration option even though it's in the documentation...

Modified: spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
==============================================================================
--- spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	(original)
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	Sun Oct 31 12:23:22 2004
@@ -205,9 +205,8 @@
   }
 
   # and query
-  my @doms = keys %domlist;
-  dbg ("URIDNSBL: domains to query: ".join(' ',@doms));
-  foreach my $dom (@doms) {
+  dbg ("URIDNSBL: domains to query: ".join(' ',@shortlist));
+  foreach my $dom (@shortlist) {
     $self->query_domain ($scanstate, $dom);
   }
 
@@ -266,6 +265,10 @@
   }
   elsif ($key eq 'uridnsbl_timeout') {
     $opts->{conf}->{uridnsbl_timeout} = $opts->{value};
+    $self->inhibit_further_callbacks(); return 1;
+  }
+  elsif ($key eq 'uridnsbl_max_domains') {
+    $opts->{conf}->{uridnsbl_max_domains} = $opts->{value};
     $self->inhibit_further_callbacks(); return 1;
   }
   elsif ($key eq 'uridnsbl_skip_domain') {