/[Apache-SVN]/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
ViewVC logotype

Diff of /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 585292, Wed Oct 17 00:04:48 2007 UTC revision 596095, Sun Nov 18 16:11:20 2007 UTC
# Line 435  sub query_domain { Line 435  sub query_domain {
435      $single_dnsbl = 1;      $single_dnsbl = 1;
436    }    }
437    
438      my $rhsblrules = $scanner->{uridnsbl_active_rules_rhsbl};
439      my $reviprules = $scanner->{uridnsbl_active_rules_revipbl};
440    
441    if ($single_dnsbl) {    if ($single_dnsbl) {
442      # look up the domain in the RHSBL subset      # look up the domain in the RHSBL subset
443      my $cf = $scanner->{uridnsbl_active_rules_rhsbl};      foreach my $rulename (keys %{$rhsblrules}) {
     foreach my $rulename (keys %{$cf}) {  
444        my $rulecf = $scanner->{conf}->{uridnsbls}->{$rulename};        my $rulecf = $scanner->{conf}->{uridnsbls}->{$rulename};
445        $self->lookup_single_dnsbl($scanner, $obj, $rulename,        $self->lookup_single_dnsbl($scanner, $obj, $rulename,
446                                   $dom, $rulecf->{zone}, $rulecf->{type});                                   $dom, $rulecf->{zone}, $rulecf->{type});
# Line 447  sub query_domain { Line 449  sub query_domain {
449        $scanner->register_async_rule_start($rulename);        $scanner->register_async_rule_start($rulename);
450      }      }
451    
452      # perform NS, A lookups to look up the domain in the non-RHSBL subset      # perform NS, A lookups to look up the domain in the non-RHSBL subset,
453      if ($dom !~ /^\d+\.\d+\.\d+\.\d+$/) {      # but only if there are active reverse-IP-URIBL rules
454        if ($dom !~ /^\d+\.\d+\.\d+\.\d+$/ && (scalar keys %{$reviprules})) {
455        $self->lookup_domain_ns($scanner, $obj, $dom);        $self->lookup_domain_ns($scanner, $obj, $dom);
456      }      }
457    }    }
# Line 456  sub query_domain { Line 459  sub query_domain {
459    # note that these rules are now underway.   important: unless the    # note that these rules are now underway.   important: unless the
460    # rule hits, in the current design, these will not be considered    # rule hits, in the current design, these will not be considered
461    # "finished" until harvest_dnsbl_queries() completes    # "finished" until harvest_dnsbl_queries() completes
462    my $cf = $scanner->{uridnsbl_active_rules_revipbl};    foreach my $rulename (keys %{$reviprules}) {
   foreach my $rulename (keys %{$cf}) {  
463      $scanner->register_async_rule_start($rulename);      $scanner->register_async_rule_start($rulename);
464    }    }
465  }  }
Legend:
Removed from v.585292  
changed lines
  Added in v.596095
apache@apache.org
 ViewVC Help
Powered by ViewVC 1.1.2