diff --git a/lib/Qpsmtpd/Transaction.pm b/lib/Qpsmtpd/Transaction.pm index 327cf49..1b280fc 100644 --- a/lib/Qpsmtpd/Transaction.pm +++ b/lib/Qpsmtpd/Transaction.pm @@ -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 you pass in B be C objects. -=head2 relaying( ) - -Returns true if this mail transaction is relaying. This value is set -by the C plugin. - =head2 sender( [ ADDRESS ] ) Get or set the sender (MAIL FROM) address in the envelope. diff --git a/plugins/auth/auth_vpopmail_sql b/plugins/auth/auth_vpopmail_sql index e82509f..031746f 100644 --- a/plugins/auth/auth_vpopmail_sql +++ b/plugins/auth/auth_vpopmail_sql @@ -78,6 +78,9 @@ sub authsql { return DECLINED; } + $self->log(LOGINFO, + "Authentication to vpopmail via mysql: $pw_name\@$pw_domain"); + my $sth = $dbh->prepare(<> 8); my $signal = ($? & 127); - unlink($filename); - my $virus; if ($output && $output =~ m/.*\W+Found (.*)\n/m) { $virus=$1; @@ -119,6 +117,8 @@ sub uvscan { 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); }