svn commit: r597617 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm Locker/Flock.pm

[jm...@apache.org]

Author: jm
Date: Fri Nov 23 01:50:50 2007
New Revision: 597617

URL: http://svn.apache.org/viewvc?rev=597617&view=rev
Log:
bug 5637: bayes_file_mode is handled incorrectly when creating bayes.mutex, resulting in incorrect permissions on that file; fix by Mihaly Barasz

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=597617&r1=597616&r2=597617&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Fri Nov 23 01:50:50 2007
@@ -2603,7 +2603,7 @@
     setting => 'bayes_file_mode',
     is_admin => 1,
     default => '0700',
-    type => $CONF_TYPE_NUMERIC
+    type => $CONF_TYPE_STRING
   });
 
 =item bayes_store_module Name::Of::BayesStore::Module

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm?rev=597617&r1=597616&r2=597617&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Flock.pm Fri Nov 23 01:50:50 2007
@@ -54,7 +54,7 @@
 
   $max_retries ||= 30;
   $mode ||= 0600;
-  $mode = oct $mode if $mode =~ /^0/;   # accept number or string
+  $mode = oct $mode;
 
   my $lock_file = "$path.mutex";
   my $umask = umask(~$mode);