Diff of /spamassassin/trunk/spamd/spamd.raw

Parent Directory | Revision Log | Patch

--- spamassassin/trunk/spamd/spamd.raw	2005/05/09 07:37:02	169245
+++ spamassassin/trunk/spamd/spamd.raw	2005/05/09 07:50:39	169246
@@ -688,10 +688,6 @@ unless ($clients_per_child > 1) {
   $copy_config_p = 0;
 }
 
-# If we need Storable, and it's not installed, alert now before we daemonize.
-die "spamd: required module Storable not found\n"
-  if ($copy_config_p && !$spamtest->_is_storable_available());
-
 ## DAEMONIZE! ##
 
 $opt{'daemonize'} and daemonize();
@@ -715,7 +711,7 @@ if ($copy_config_p) {
   }
 
   $spamtest->copy_config(undef, \%conf_backup) ||
-    die "spamd: error returned from copy_config, no Storable module?\n";
+    die "spamd: error returned from copy_config\n";
 }
 
 # setup signal handlers before the kids since we may have to kill them...
@@ -915,6 +911,8 @@ sub spawn {
       {
         # use a timeout!  There are bugs in Storable on certain platforms
         # that can cause spamd to hang -- see bug 3828 comment 154.
+        # we don't use Storable any more, but leave this in -- just
+        # in case.
         my $oldalarm = 0;
         eval {
           local $SIG{ALRM} = sub { die "__alarm__\n" };
@@ -928,7 +926,7 @@ sub spawn {
           # (potentially), so let's restore back the saved version we
           # had before.
           $spamtest->copy_config(\%conf_backup, undef) ||
-            die "error returned from copy_config, no Storable module?\n";
+            die "error returned from copy_config\n";
           alarm $oldalarm;
         };