4.26.6: missing tweaks to SweepOther.pm

[Julian Field]

Added.

At 18:39 29/01/2004, you wrote:
>Julian,
>
>    Somewhere in 4.25-14 I added the following changes to
>lib/MailScanner/SweepOther.pm, per the suggestion of somebody
>else on the list, something I find really useful:
>
>*** SweepOther.pm.orig  Thu Dec  4 08:08:07 2003
>--- SweepOther.pm       Thu Dec  4 08:17:18 2003
>***************
>*** 197,204 ****
>             #print STDERR "\"$attach\" matched \"$regexp\" or
> \"$safename\" did\n";
>             if ($allowdeny =~ 'deny') {
>               # It's a rejection rule, so log the error.
>!             MailScanner::Log::InfoLog("Filename Checks: %s (%s)",
>!                                       $logtext, $attach);
>               $message->{namereports}{$safename} .= "$usertext
> ($safename)\n";
>               $message->{nametypes}{$safename}   .= "f";
>               $counter++;
>--- 197,204 ----
>             #print STDERR "\"$attach\" matched \"$regexp\" or
> \"$safename\" did\n";
>             if ($allowdeny =~ 'deny') {
>               # It's a rejection rule, so log the error.
>!             MailScanner::Log::InfoLog("Filename Checks: %s (%s %s)",
>!                                       $logtext, $id, $attach);
>               $message->{namereports}{$safename} .= "$usertext
> ($safename)\n";
>               $message->{nametypes}{$safename}   .= "f";
>               $counter++;
>***************
>*** 206,217 ****
>               # Do we want to delete the attachment or store it?
>               $message->{deleteattach}{$safename} = 1 if $allowdeny =~
> /delete/;
>             } else {
>!             MailScanner::Log::InfoLog("Filename Checks: Allowing %s",
>$safename)
>                 if $LogNames;
>             }
>           }
>!         MailScanner::Log::InfoLog("Filename Checks: Allowing %s " .
>!                                   "(no rule matched)", $safename)
>             if $LogNames && !$MatchFound;
>         }
>       }
>--- 206,217 ----
>               # Do we want to delete the attachment or store it?
>               $message->{deleteattach}{$safename} = 1 if $allowdeny =~
> /delete/;
>             } else {
>!             MailScanner::Log::InfoLog("Filename Checks: Allowing %s %s",
>$id, $safename)
>                 if $LogNames;
>             }
>           }
>!         MailScanner::Log::InfoLog("Filename Checks: Allowing %s %s " .
>!                                   "(no rule matched)", $id, $safename)
>             if $LogNames && !$MatchFound;
>         }
>       }
>***************
>*** 353,360 ****
>           $MatchFound = 1;
>           if ($allowdeny =~ /deny/) {
>             # It's a rejection rule, so log the error.
>!           MailScanner::Log::InfoLog("Filetype Checks: %s (%s)",
>!                                     $logtext, $attach);
>             $message->{namereports}{$safename} .= "$usertext ($safename)\n";
>             $message->{nametypes}{$safename}   .= "f";
>             $counter++;
>--- 353,360 ----
>           $MatchFound = 1;
>           if ($allowdeny =~ /deny/) {
>             # It's a rejection rule, so log the error.
>!           MailScanner::Log::InfoLog("Filetype Checks: %s (%s %s)",
>!                                     $logtext, $id, $attach);
>             $message->{namereports}{$safename} .= "$usertext ($safename)\n";
>             $message->{nametypes}{$safename}   .= "f";
>             $counter++;
>***************
>*** 362,368 ****
>             # Do we want to delete the attachment or store it?
>             $message->{deleteattach}{$safename} = 1 if $allowdeny =~
> /delete/;
>           } else {
>!           MailScanner::Log::InfoLog("Filetype Checks: Allowing %s",
>$safename)
>               if $LogTypes;
>           }
>         }
>--- 362,368 ----
>             # Do we want to delete the attachment or store it?
>             $message->{deleteattach}{$safename} = 1 if $allowdeny =~
> /delete/;
>           } else {
>!           MailScanner::Log::InfoLog("Filetype Checks: Allowing %s %s",
>$id, $safename)
>               if $LogTypes;
>           }
>         }
>
>I see that they didn't get into 4.26.6.  Any chance they
>could?  Thanks.
>
>Jeff Earickson
>Colby College

--
Julian Field
www.MailScanner.info
MailScanner thanks transtec Computers for their support

PGP footprint: EE81 D763 3DB0 0BFD E1DC 7222 11F6 5947 1415 B654