cvs commit: qpsmtpd/plugins/virus uvscan

cvsuser     04/09/23 11:54:59

  Modified:    lib/Qpsmtpd Transaction.pm
               plugins/auth auth_vpopmail_sql
               plugins/virus uvscan
  Log:
  Couple of minor cleanups
  
  *    lib/Qpsmtpd/Transaction.pm
       Forgot to nuke POD for deprecated relaying()
  
  *    plugins/auth/auth_vpopmail_sql
       Log who actually AUTHenticated
  
  *    plugins/virus/uvscan
       Don't need to unlink the file (Qpsmtpd will take care of it)
       Log the machine that did the actual Antivirus scanning
  
  Revision  Changes    Path
  1.18      +0 -5      qpsmtpd/lib/Qpsmtpd/Transaction.pm
  
  Index: Transaction.pm
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/lib/Qpsmtpd/Transaction.pm,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -w -r1.17 -r1.18
  --- Transaction.pm	23 Sep 2004 13:51:09 -0000	1.17
  +++ Transaction.pm	23 Sep 2004 18:54:58 -0000	1.18
  @@ -173,11 +173,6 @@
   the recipient list to an entirely new list. Note that the recipients
   you pass in B<MUST> be C<Qpsmtpd::Address> objects.
   
  -=head2 relaying( )
  -
  -Returns true if this mail transaction is relaying.  This value is set
  -by the C<check_relay> plugin.
  -
   =head2 sender( [ ADDRESS ] )
   
   Get or set the sender (MAIL FROM) address in the envelope.
  
  
  
  1.2       +3 -0      qpsmtpd/plugins/auth/auth_vpopmail_sql
  
  Index: auth_vpopmail_sql
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/auth/auth_vpopmail_sql,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- auth_vpopmail_sql	30 Jun 2004 09:21:40 -0000	1.1
  +++ auth_vpopmail_sql	23 Sep 2004 18:54:58 -0000	1.2
  @@ -78,6 +78,9 @@
           return DECLINED;
       }
   
  +    $self->log(LOGINFO,
  +	"Authentication to vpopmail via mysql: $pw_name\@$pw_domain");
  +
       my $sth = $dbh->prepare(<<SQL);
   select pw_clear_passwd
   from vpopmail
  
  
  
  1.2       +3 -3      qpsmtpd/plugins/virus/uvscan
  
  Index: uvscan
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/virus/uvscan,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- uvscan	16 Jul 2004 20:23:17 -0000	1.1
  +++ uvscan	23 Sep 2004 18:54:58 -0000	1.2
  @@ -76,8 +76,6 @@
     my $result = ($? >> 8);
     my $signal = ($? & 127);
    
  -  unlink($filename);
  -
     my $virus;
     if ($output && $output =~ m/.*\W+Found (.*)\n/m) {
       $virus=$1;
  @@ -119,6 +117,8 @@
       return (DECLINED);
     }
     
  -  $transaction->header->add('X-Virus-Checked', 'Checked');
  +  $transaction->header->add('X-Virus-Checked',
  +    "Checked by McAfee uvscan on ".$self->qp->config("me"));
  +
     return (DECLINED);
   }