You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/08/10 16:45:57 UTC
svn commit: r1864890 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Author: hege
Date: Sat Aug 10 16:45:56 2019
New Revision: 1864890
URL: http://svn.apache.org/viewvc?rev=1864890&view=rev
Log:
Let URIDNSBL set URIDOMAINS/URIHOSTS tag even if empty
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1864890&r1=1864889&r2=1864890&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Sat Aug 10 16:45:56 2019
@@ -345,15 +345,7 @@ sub parsed_metadata {
my $conf = $pms->{conf};
return 0 if $conf->{skip_uribl_checks};
-
- if (!$pms->is_dns_available()) {
- $self->{dns_not_available} = 1;
- return 0;
- } else {
- # due to re-testing dns may become available after being unavailable
- # DOS: I don't think dns_not_available is even used anymore
- $self->{dns_not_available} = 0;
- }
+ return 0 if !$pms->is_dns_available();
$pms->{'uridnsbl_activerules'} = { };
$pms->{'uridnsbl_hits'} = { };
@@ -489,10 +481,10 @@ sub parsed_metadata {
my @hnames = sort keys %hostlist;
$pms->set_tag('URIHOSTS',
- @hnames == 1 ? $hnames[0] : \@hnames) if @hnames;
+ @hnames == 1 ? $hnames[0] : \@hnames);
my @dnames = do { my %seen; grep { !$seen{$_}++ } sort values %hostlist };
$pms->set_tag('URIDOMAINS',
- @dnames == 1 ? $dnames[0] : \@dnames) if @dnames;
+ @dnames == 1 ? $dnames[0] : \@dnames);
# and query
$self->query_hosts_or_domains($pms, \%hostlist);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1864890&r1=1864889&r2=1864890&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Sat Aug 10 16:45:56 2019
@@ -479,10 +479,10 @@ sub check_dnsbl {
my @hnames = sort keys %hostlist;
$pms->set_tag('URIHOSTS',
- @hnames == 1 ? $hnames[0] : \@hnames) if @hnames;
+ @hnames == 1 ? $hnames[0] : \@hnames);
my @dnames = do { my %seen; grep { !$seen{$_}++ } sort values %hostlist };
$pms->set_tag('URIDOMAINS',
- @dnames == 1 ? $dnames[0] : \@dnames) if @dnames;
+ @dnames == 1 ? $dnames[0] : \@dnames);
# and query
$self->query_hosts_or_domains($pms, \%hostlist);