Mailing List Archive

Author: jm
Date: Thu Jul 28 15:56:43 2005
New Revision: 226278

URL: http://svn.apache.org/viewcvs?rev=226278&view=rev
Log:
bug 4448: use_dcc and use_pyzor fail to function via SQL prefs if disabled in local.cf

Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=226278&r1=226277&r2=226278&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm Thu Jul 28 15:56:43 2005
@@ -285,9 +285,11 @@

if ($self->is_dccifd_available()) {
$self->{dcc_interface} = "dccifd";
+ $self->{dcc_disabled} = 0;
}
elsif ($self->is_dccproc_available()) {
$self->{dcc_interface} = "dccproc";
+ $self->{dcc_disabled} = 0;
}
else {
dbg("dcc: dccifd and dccproc are not available, disabling DCC");
@@ -305,7 +307,7 @@
return 1;
}

- $self->get_dcc_interface() unless $self->{dcc_interface};
+ $self->get_dcc_interface();
return 0 if $self->{dcc_disabled};

if ($$full eq '') {

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=226278&r1=226277&r2=226278&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Thu Jul 28 15:56:43 2005
@@ -191,6 +191,7 @@
}
elsif ($self->is_pyzor_available()) {
$self->{pyzor_interface} = "pyzor";
+ $self->{pyzor_available} = 1;
}
else {
dbg("pyzor: no pyzor found, disabling Pyzor");
@@ -201,7 +202,7 @@
sub check_pyzor {
my ($self, $permsgstatus, $full) = @_;

- $self->get_pyzor_interface() unless $self->{pyzor_interface};
+ $self->get_pyzor_interface();
return 0 unless $self->{pyzor_available};

return $self->pyzor_lookup($permsgstatus, $full);