svn commit: r906193 - /spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/DCC.pm

[mm...@apache.org]

Author: mmartinec
Date: Wed Feb  3 19:23:40 2010
New Revision: 906193

URL: http://svn.apache.org/viewvc?rev=906193&view=rev
Log:
Bug 6316: DCC.pm, wrong options for dcc_proc,
(plus: avoid a warning on undef in logger when
dccifd socket is not provided)

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

Modified: spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=906193&r1=906192&r2=906193&view=diff
==============================================================================
--- spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/DCC.pm Wed Feb  3 19:23:40 2010
@@ -449,6 +449,8 @@
     }
     if (defined $sockpath && -S $sockpath && -w _ && -r _) {
       $self->{dccifd_available} = 1;
+    } elsif (!defined $conf->{dcc_dccifd_path_raw}) {
+      dbg("dcc: dccifd is not available: no r/w dccifd socket found");
     } else {
       dbg("dcc: dccifd is not available: no r/w dccifd socket found: %s",
           $conf->{dcc_dccifd_path_raw});
@@ -679,7 +681,7 @@
   my $left;
   my $right;
   my $timeout = $conf->{dcc_timeout};
-  my $opts = $conf->{dcc_options};
+  my $opts = $conf->{dccifd_options};
   my @opts = !defined $opts ? () : split(' ',$opts);
 
   $permsgstatus->enter_helper_run_mode();
@@ -906,7 +908,7 @@
   my $conf = $self->{main}->{conf};
   my $timeout = $conf->{dcc_timeout};
   # instead of header use whatever the report option is
-  my $opts = $conf->{dcc_options};
+  my $opts = $conf->{dccifd_options};
   my @opts = !defined $opts ? () : split(' ',$opts);
 
   $options->{report}->enter_helper_run_mode();