diff -ruN qmail-scanner-1.25-factory/configure qmail-scanner-1.25-patched/configure
--- qmail-scanner-1.25-factory/configure	2004-10-18 20:26:55.000000000 -0400
+++ qmail-scanner-1.25-patched/configure	2006-01-19 22:37:24.000000000 -0500
@@ -1730,7 +1730,7 @@
     mv -f $BINDIR/qmail-scanner-queue.pl $BINDIR/qmail-scanner-queue.pl.old 2>/dev/null
     cp -f qmail-scanner-queue.pl $BINDIR/qmail-scanner-queue.pl
     chown $QS_USER:$QS_USER $BINDIR/qmail-scanner-queue.pl
-    chmod 4755 $BINDIR/qmail-scanner-queue.pl
+    chmod 6755 $BINDIR/qmail-scanner-queue.pl
     if [ -f "$BINDIR/antivirus-qmail-queue.pl" -a ! -L "$BINDIR/antivirus-qmail-queue.pl" ]; then
 	mv -f $BINDIR/antivirus-qmail-queue.pl $BINDIR/antivirus-qmail-queue.pl.old
 	ln -s $BINDIR/qmail-scanner-queue.pl $BINDIR/antivirus-qmail-queue.pl
diff -ruN qmail-scanner-1.25-factory/qmail-scanner-queue.template qmail-scanner-1.25-patched/qmail-scanner-queue.template
--- qmail-scanner-1.25-factory/qmail-scanner-queue.template	2005-01-27 17:51:58.000000000 -0500
+++ qmail-scanner-1.25-patched/qmail-scanner-queue.template	2006-01-19 22:31:17.000000000 -0500
@@ -315,10 +315,10 @@
 }
 
 chdir($scandir);
-umask(0077);
+umask(0027);
 
 if (! -d "$scandir/tmp") {
-  mkdir("$scandir/tmp",0700) || &error_condition("cannot create $scandir/tmp - $!");
+  mkdir("$scandir/tmp",0750) || &error_condition("cannot create $scandir/tmp - $!");
 }
 
 my ($quarantine_event,$quarantine_event_tmp,$quarantine_DOS)=0;
@@ -357,7 +357,7 @@
 
 &debug("setting UID to EUID so subprocesses can access files generated by this script");
 $< = $>;            # set real to effective uid
-#$( = $);            # set real to effective gid
+$( = $);            # set real to effective gid
 
 &debug("program name is $prog, version $VERSION");
 if ($opt_z) {
@@ -525,7 +525,7 @@
   select(STDIN); $|=1;
   
   &debug("w_c: mkdir $ENV{'TMPDIR'}");
-  mkdir("$ENV{'TMPDIR'}",0700)||&error_condition("$ENV{'TMPDIR'} exists - try again later...");
+  mkdir("$ENV{'TMPDIR'}",0750)||&error_condition("$ENV{'TMPDIR'} exists - try again later...");
   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");