diff -Nur -x '*.orig' -x '*.rej' smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan
--- smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan	2006-12-13 03:43:25.000000000 -0700
+++ mezzanine_patched_smeserver-clamav-1.2.0/root/sbin/e-smith/smeserver-clamscan	2006-12-13 03:43:20.000000000 -0700
@@ -29,6 +29,8 @@
 
 my $MailReport = $db->get_prop("clamav", "FilesystemScanReportTo") || 'admin';
 
+my $ArchiveRatio = $db->get_prop("clamav", "ArchiveMaxCompressionRatio") || 0;
+
 my $clamscan_opts = " --recursive --infected --stdout" .
 		    " --log /var/log/clamd/clamscan.log";
 
@@ -42,10 +44,18 @@
 
 $clamscan_opts .= " --exclude=$_" for (@exclude);
 
+$clamscan_opts .= " --max-ratio=$ArchiveRatio";
+
+$clamscan_opts .= " --no-html"
+      if ($db->get_prop("clamav", "ScanHTML") || "yes") eq "no";
+
+$clamscan_opts .= " --no-mail" 
+        if ($db->get_prop("clamav", "ScanMail") || "yes") eq "no";
+
 $clamscan_opts .= " --move=$quarantine_dir" 
 	if ($db->get_prop("clamav", "Quarantine") || "disabled") eq "enabled";
 
-open CLAMSCAN, "-|", "nice /usr/bin/clamscan $clamscan_opts $filesystems 2>\&1";
+open CLAMSCAN, "-|", "nice /usr/bin/clamscan $clamscan_opts $filesystems 2> /var/log/clamd/smeserver-clamscan.log";
 
 my @report = <CLAMSCAN>;
 close CLAMSCAN;