svn commit: rev 23132 - in spamassassin/trunk: lib/Mail spamd

[fe...@apache.org]

Author: felicity
Date: Wed Jul 21 20:47:13 2004
New Revision: 23132

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin.pm
   spamassassin/trunk/spamd/spamd.raw
Log:
bug 3609: bayes_learn_to_journal wasn't honored in spamd.  we now backup the setting in spamd, and update it per the user's configuration in signal_changed_user().

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm	Wed Jul 21 20:47:13 2004
@@ -594,6 +594,9 @@
   $self->{bayes_scanner}->finish();
   $self->{bayes_scanner} = new Mail::SpamAssassin::Bayes ($self);
 
+  # this user may have a different learn_to_journal setting, so reset appropriately
+  $self->{'learn_to_journal'} = $self->{conf}->{bayes_learn_to_journal};
+
   $set |= 1 unless $self->{local_tests_only};
   $set |= 2 if $self->{bayes_scanner}->is_scan_available();
 

Modified: spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw	(original)
+++ spamassassin/trunk/spamd/spamd.raw	Wed Jul 21 20:47:13 2004
@@ -727,7 +727,7 @@
 }
 
 if ($copy_config_p) {
-  foreach( 'username', 'user_dir', 'userstate_dir' ) {
+  foreach( 'username', 'user_dir', 'userstate_dir', 'learn_to_journal' ) {
     $msa_backup{$_} = $spamtest->{$_} if (exists $spamtest->{$_});
   }