SweepOther.pm contextual diffs for 4.26.6

[Jeff A. Earickson]

Julian,
   Attached is the "diff -c" changes to the 4.26.6 version
of SweepOther.pm, should have sent that along the first time.

Jeff
-------------- next part --------------
*** SweepOther.pm.orig	Thu Jan 29 13:40:18 2004
--- SweepOther.pm	Thu Jan 29 13:42:54 2004
***************
*** 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;
          }
        }