--- qmail-scanner-queue.template.oorig	Fri May 14 15:43:57 2004
+++ qmail-scanner-queue.template	Fri May 14 15:44:51 2004
@@ -296,7 +296,9 @@
 umask(0077);
 
 if (! -d "$scandir/tmp") {
-  mkdir("$scandir/tmp",0700) || &error_condition("cannot create $scandir/tmp - $!");
+  umask(0007);
+  mkdir("$scandir/tmp",0770) || &error_condition("cannot create $scandir/tmp - $!");
+  umask(0077);
 }
 
 my $quarantine_event=0;
@@ -510,7 +512,9 @@
   select(STDIN); $|=1;
   
   &debug("w_c: mkdir $ENV{'TMPDIR'}");
-  mkdir("$ENV{'TMPDIR'}",0700)||&error_condition("$file_id exists - try again later...");
+  umask(0007);
+  mkdir("$ENV{'TMPDIR'}",0770)||&error_condition("$file_id exists - try again later...");
+  umask(0077);
   chdir("$ENV{'TMPDIR'}")||&error_condition("cannot chdir to $ENV{'TMPDIR'}/");
   if (-f "$scandir/$wmaildir/tmp/$file_id" || -f "$scandir/$wmaildir/new/$file_id") {
     &error_condition("$file_id exists, try again later");