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 git-svn-id: https://svn.perl.org/qpsmtpd/trunk@329 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
03455aff9a
commit
b5ef3d3add
@ -173,11 +173,6 @@ This method is also a setter. Pass in a list of recipients to change
|
|||||||
the recipient list to an entirely new list. Note that the recipients
|
the recipient list to an entirely new list. Note that the recipients
|
||||||
you pass in B<MUST> be C<Qpsmtpd::Address> objects.
|
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 ] )
|
=head2 sender( [ ADDRESS ] )
|
||||||
|
|
||||||
Get or set the sender (MAIL FROM) address in the envelope.
|
Get or set the sender (MAIL FROM) address in the envelope.
|
||||||
|
@ -78,6 +78,9 @@ sub authsql {
|
|||||||
return DECLINED;
|
return DECLINED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$self->log(LOGINFO,
|
||||||
|
"Authentication to vpopmail via mysql: $pw_name\@$pw_domain");
|
||||||
|
|
||||||
my $sth = $dbh->prepare(<<SQL);
|
my $sth = $dbh->prepare(<<SQL);
|
||||||
select pw_clear_passwd
|
select pw_clear_passwd
|
||||||
from vpopmail
|
from vpopmail
|
||||||
|
@ -76,8 +76,6 @@ sub uvscan {
|
|||||||
my $result = ($? >> 8);
|
my $result = ($? >> 8);
|
||||||
my $signal = ($? & 127);
|
my $signal = ($? & 127);
|
||||||
|
|
||||||
unlink($filename);
|
|
||||||
|
|
||||||
my $virus;
|
my $virus;
|
||||||
if ($output && $output =~ m/.*\W+Found (.*)\n/m) {
|
if ($output && $output =~ m/.*\W+Found (.*)\n/m) {
|
||||||
$virus=$1;
|
$virus=$1;
|
||||||
@ -119,6 +117,8 @@ sub uvscan {
|
|||||||
return (DECLINED);
|
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);
|
return (DECLINED);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user