diff options
| author | pav <pav@FreeBSD.org> | 2004-06-07 07:18:36 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-06-07 07:18:36 +0800 |
| commit | c0598f26c36c4c09743fd5c98ef07c80a2e18806 (patch) | |
| tree | eda12b5b30b8a5e49cdfaf5fbdf0c63595202167 /security | |
| parent | 8a2e846a77e8b32f20bf87dbffe269ee5488b636 (diff) | |
| download | freebsd-ports-gnome-c0598f26c36c4c09743fd5c98ef07c80a2e18806.tar.gz freebsd-ports-gnome-c0598f26c36c4c09743fd5c98ef07c80a2e18806.tar.zst freebsd-ports-gnome-c0598f26c36c4c09743fd5c98ef07c80a2e18806.zip | |
- Really fix connection to clamd
- Actually use result returned by clamd
PR: ports/67621
Submitted by: Yoshisato YANAGISAWA <osho@pcc-software.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/amavisd/files/patch-amavis-av-clamavd | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/security/amavisd/files/patch-amavis-av-clamavd b/security/amavisd/files/patch-amavis-av-clamavd index 1832e3aa9ace..6419b3745dbb 100644 --- a/security/amavisd/files/patch-amavis-av-clamavd +++ b/security/amavisd/files/patch-amavis-av-clamavd @@ -1,11 +1,20 @@ --- amavis/av/clamavd.orig Tue Feb 25 11:42:54 2003 -+++ amavis/av/clamavd Sun May 30 13:26:34 2004 ++++ amavis/av/clamavd Mon Jun 7 01:16:46 2004 @@ -5,7 +5,7 @@ if ($clamd) { do_log(2,"Using clamd"); - my $sock = IO::Socket::INET->new('127.0.0.1:3310'); -+ my $sock = IO::Socket::UNIX->new('/var/run/clamav/clamd'); ++ my $sock = IO::Socket::UNIX->new(Peer => '/var/run/clamav/clamd'); if (defined $sock) { $sock->print("SCAN $TEMPDIR/parts\n"); $sock->flush; +@@ -15,7 +15,7 @@ + if ($output =~ /FOUND$/) { # no errors, a virus was found + $scanner_errors = 0; + @virusname = ($output =~ /: (.+) FOUND/g); +- return 1; # 'true' indicates virus found and stops further checking ++ do_virus($output); + } elsif ($output =~ /OK$/) { # no errors, no viruses + $scanner_errors = 0; + } elsif ($output =~ /ERROR$/) { |