byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* plugins/virus/clamdscan

Browse Source 
Correctly support alternate domain socket
    Remove a tab that crept in


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@383 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
John Peacock 2005-03-04 16:04:59 +00:00
parent a44957dc86
commit 43f39a4538
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/virus/clamdscan
View File

@ -55,7 +55,7 @@ Full path to the clamd socket (the recommended mode); defaults to
=item B<clamd_port>
If present, must be the TCP port where the clamd service is running,
typically 3310; default disabled.
typically 3310; default disabled. If present, overrides the clamd_socket.
=item B<deny_viruses>
@ -138,8 +138,14 @@ sub clamdscan {
my $clamd;
if ( $self->{"_clamd"}->{"clamd_port"}
and $self->{"_clamd"}->{"clamd_port"} =~ /(\d+)/ )
if (
(
$self->{"_clamd"}->{"clamd_port"}
and $self->{"_clamd"}->{"clamd_port"} =~ /(\d+)/
)
or ( $self->{"_clamd"}->{"clamd_socket"}
and $self->{"_clamd"}->{"clamd_socket"} =~ /([\w\/.]+)/ )
)
{
my $port = $1;
$clamd = Clamd->new( port => $port );
@ -152,7 +158,7 @@ sub clamdscan {
if ( my %found = $clamd->scan($filename) ) {
my $viruses = join( ",", values(%found) );
$self->log( LOGERROR, "One or more virus(es) found: $viruses" );
$self->log( LOGERROR, "One or more virus(es) found: $viruses" );
if ( lc( $self->{"_clamd"}->{"deny_viruses"} ) eq "yes" ) {
return ( DENY,