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/09/04 06:40:16 UTC
svn commit: r1866354 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
Author: hege
Date: Wed Sep 4 06:40:15 2019
New Revision: 1866354
URL: http://svn.apache.org/viewvc?rev=1866354&view=rev
Log:
Fix reporting / find_dcc_home
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=1866354&r1=1866353&r2=1866354&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Wed Sep 4 06:40:15 2019
@@ -552,6 +552,7 @@ sub is_dccifd_available {
# dccifd remains available until it breaks
return $self->{dccifd_available} if $self->{dccifd_available};
+ $self->find_dcc_home();
my $conf = $self->{main}->{conf};
# deal with configured INET or INET6 socket
@@ -587,6 +588,7 @@ sub is_dccproc_available {
# dccproc remains (un)available so check only once
return $self->{dccproc_available} if defined $self->{dccproc_available};
+ $self->find_dcc_home();
my $dccproc = $conf->{dcc_path};
if (!defined $dccproc || $dccproc eq '') {
$dccproc = $self->dcc_pgm_path('dccproc');
@@ -744,7 +746,6 @@ sub check_dnsbl {
@{$pms->{conf}->{eval_to_rule}->{check_dcc_reputation_range}} );
# Launch async only if dccifd found
- $self->find_dcc_home();
if ($self->is_dccifd_available()) {
$self->_launch_dcc($pms);
}