svn commit: rev 10112 - in incubator/spamassassin/trunk/lib/Mail/SpamAssassin: . BayesStore Locker

[fe...@apache.org]

Author: felicity
Date: Mon Apr 19 19:13:32 2004
New Revision: 10112

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Unix.pm
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Log:
bug 3283: had some issues with umask settings

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm	Mon Apr 19 19:13:32 2004
@@ -854,12 +854,16 @@
   # use append mode, write atomically, then close, so simultaneous updates are
   # not lost
   my $conf = $self->{bayes}->{main}->{conf};
+
+  # set the umask to the inverse of what we want ...
   my $umask = umask(0777 - (oct ($conf->{bayes_file_mode}) & 0666));
+
   if (!open (OUT, ">>".$path)) {
     warn "cannot write to $path, Bayes db update ignored: $!\n";
     umask $umask; # reset umask
     return;
   }
+  umask $umask; # reset umask
 
   # do not use print() here, it will break up the buffer if it's >8192 bytes,
   # which could result in two sets of tokens getting mixed up and their
@@ -897,7 +901,6 @@
   if (!close OUT) {
     warn "cannot write to $path, Bayes db update ignored\n";
   }
-  umask $umask; # reset umask
 
   $self->{string_to_journal} = '';
 }

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Unix.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Unix.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Locker/Unix.pm	Mon Apr 19 19:13:32 2004
@@ -60,9 +60,9 @@
   my $lock_tmp = Mail::SpamAssassin::Util::untaint_file_path
 					("$path.lock.$hname.$$");
 
-  my $umask = 077;
+  my $umask = umask 077;
   if (!open(LTMP, ">$lock_tmp")) {
-      umask $umask;
+      umask $umask; # just in case
       die "lock: $$ cannot create tmp lockfile $lock_tmp for $lock_file: $!\n";
   }
   umask $umask;

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm	Mon Apr 19 19:13:32 2004
@@ -677,7 +677,7 @@
   }
 
   my $reportfile;
-  my $umask = 0;
+  my $umask = umask 077;
   do {
     # we do not rely on the obscurity of this name for security...
     # we use a average-quality PRG since this is all we need