[Mimedefang] [PATCH] Fix for hardcoded clamscan in mimedefang.pl

[Martin Blapp]

Hi David,

It seems that this last patch has been improperly done: I got various
failures like:

Jun  2 01:10:35 filter1 mimedefang.pl[56787]: k51N9qlg076697: 
run_virus_scanner: Unable to execute clamscan -r --unzip --unrar --mbox 
--stdout --disable-summary --infected ./Work 2>&1: No such file or directory
Jun  2 01:10:35 filter1 mimedefang.pl[56787]: k51N9qlg076697: Clamd returned 
error: Zip module failure

--- mimedefang-2.56/mimedefang.pl.in.orig  Fri Jun  2 16:55:01 2006
+++ mimedefang-2.56/mimedefang.pl.in       Fri Jun  2 16:55:48 2006
@@ -4603,7 +4603,7 @@
             # This is despicable, but it might work
             if ($err_detail =~ /zip module failure/i) {
                 my ($code, $category, $action) =
-               run_virus_scanner("clamscan -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
+               run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
                 if ($action ne 'proceed') {
                         return (wantarray ? ($code, $category, $action) : 
$code);
                 }
@@ -4699,7 +4699,7 @@
             # This is despicable, but it might work
             if ($err_detail =~ /zip module failure/i) {
                 my ($code, $category, $action) =
-                   run_virus_scanner("clamscan -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
+                   run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
                 if ($action ne 'proceed') {
                         return (wantarray ? ($code, $category, $action) : 
$code);
                 }

Thank you for fixing.

Martin

Martin Blapp, <mb at imp.ch> <mbr at FreeBSD.org>
------------------------------------------------------------------
ImproWare AG, UNIXSP & ISP, Zurlindenstrasse 29, 4133 Pratteln, CH
Phone: +41 61 826 93 00 Fax: +41 61 826 93 01
PGP: <finger -l mbr at freebsd.org>
PGP Fingerprint: B434 53FC C87C FE7B 0A18 B84C 8686 EF22 D300 551E
------------------------------------------------------------------