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 2012/04/01 16:28:08 UTC
svn commit: r1308124 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
Author: hege
Date: Sun Apr 1 14:28:07 2012
New Revision: 1308124
URL: http://svn.apache.org/viewvc?rev=1308124&view=rev
Log:
Bug 6698: Fix uninitialized $dir, remove unused $dcc_libexec
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=1308124&r1=1308123&r2=1308124&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Sun Apr 1 14:28:07 2012
@@ -425,7 +425,6 @@ sub ck_dir {
sub find_dcc_home {
my ($self) = @_;
- my $dcc_libexec;
# just once
return if defined $self->{dcc_version};
@@ -515,6 +514,7 @@ sub dcc_pgm_path {
# try dcc_home/bin, dcc_libexec, and some desperate last attempts
foreach my $dir ($conf->{dcc_home}.'/bin', $conf->{dcc_libexec},
'/usr/local/bin', '/usr/local/dcc', '/var/dcc') {
+ next unless defined $dir;
$pgmpath = $dir . '/' . $pgm;
if (-x $pgmpath) {
dbg("dcc: dcc_pgm_path, found %s in %s: %s", $pgm,$dir,$pgmpath);