svn commit: rev 55244 - in spamassassin/branches/3.0: . spamd

[pa...@apache.org]

Author: parker
Date: Thu Oct 21 11:02:10 2004
New Revision: 55244

Modified:
   spamassassin/branches/3.0/INSTALL
   spamassassin/branches/3.0/spamd/spamd.raw
Log:
Bug 3826: Turn copy config on for all cases, it will still turn itself off when max client == 1

Modified: spamassassin/branches/3.0/INSTALL
==============================================================================
--- spamassassin/branches/3.0/INSTALL	(original)
+++ spamassassin/branches/3.0/INSTALL	Thu Oct 21 11:02:10 2004
@@ -199,12 +199,11 @@
 
   - Storable (from CPAN)
 
-    This is a required module if you use spamd and allow user
-    configurations to be used (ie: you don't use -x, -u, -q/--sql-config,
-    -Q/--setuid-with-sql, --ldap-config, or --setuid-with-ldap).  Third
+    This is a required module if you use spamd and allow children to
+    handle more than one client connection before quitting. Third
     party utilities may also require this module for the same
-    functionality.  Storable is used to shift configuration when a spamd
-    process switches between users.
+    functionality.  Storable is used to shift configuration when a
+    spamd process switches between users.
 
     Debian: apt-get install libstorable-perl
     Gentoo: emerge dev-perl/Storable

Modified: spamassassin/branches/3.0/spamd/spamd.raw
==============================================================================
--- spamassassin/branches/3.0/spamd/spamd.raw	(original)
+++ spamassassin/branches/3.0/spamd/spamd.raw	Thu Oct 21 11:02:10 2004
@@ -488,7 +488,8 @@
 	(!$opt{'user-config'} && !($opt{'setuid-with-sql'}||$opt{'setuid-with-ldap'}))
 	) ? 0 : 1;
 
-my $copy_config_p = $setuid_to_user || $opt{'sql-config'} || $opt{'ldap-config'} || $opt{'virtual-config-dir'};
+# always copy the config, later code may disable
+my $copy_config_p = 1;
 
 my $current_user;
 
@@ -725,6 +726,13 @@
   }
 );
 
+# 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
+  # after closing the connection
+  $copy_config_p = 0;
+}
+
 # If we need Storable, and it's not installed, alert now before we daemonize.
 die "Required module Storable not found!\n"
   if ($copy_config_p && !$spamtest->_is_storable_available());
@@ -746,13 +754,6 @@
 my %conf_backup = ();
 my %msa_backup = ();
 
-# 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
-  # after closing the connection
-  $copy_config_p = 0;
-}
-
 if ($copy_config_p) {
   foreach( 'username', 'user_dir', 'userstate_dir', 'learn_to_journal' ) {
     $msa_backup{$_} = $spamtest->{$_} if (exists $spamtest->{$_});
@@ -2154,9 +2155,12 @@
 
 =item B<-x>, B<--nouser-config>, B<--user-config>
 
-Turn off(on) per-user config files.  All users will just get the default
-configuration.   The default behaviour is for per-user configuration
-to be on.
+Turn off(on) reading of per-user configuration files (user_prefs) from the
+user's home directory.  The default behaviour is to read per-user
+configuration from the user's home directory.
+
+This option does not disable or otherwise influence the SQL, LDAP or
+Virtual Config Dir settings.
 
 =item B<--auth-ident>