svn commit: r579983 - /spamassassin/trunk/spamd/spamd.raw

[jm...@apache.org]

Author: jm
Date: Thu Sep 27 05:16:31 2007
New Revision: 579983

URL: http://svn.apache.org/viewvc?rev=579983&view=rev
Log:
bug 5606: too-early init_learner() call causes root's user prefs file to be read when spamd is started; this is inappropriate.  fix

Modified:
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=579983&r1=579982&r2=579983&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Thu Sep 27 05:16:31 2007
@@ -875,10 +875,6 @@
   }
 );
 
-$spamtest->init_learner({
-  opportunistic_expire_check_only => 1,
-});
-
 # if $clients_per_child == 1, there's no point in copying configs around
 unless ($clients_per_child > 1) {
   # unset $copy_config_p so we don't bother trying to copy things back
@@ -899,6 +895,11 @@
 # should be done post-daemonize such that any files created by this
 # process are written with the right ownership and everything.
 preload_modules_with_tmp_homedir();
+
+# this must be after preload_modules_with_tmp_homedir(), for bug 5606
+$spamtest->init_learner({
+  opportunistic_expire_check_only => 1,
+});
 
 # bayes DBs may still be tied() at this point, so untie them and such.
 $spamtest->finish_learner();