--- rpms/qpsmtpd/sme7/qpsmtpd-0.40-clamav_fix.patch	2007/06/14 20:01:08	1.1
+++ rpms/qpsmtpd/sme7/qpsmtpd-0.40-clamav_fix.patch	2007/06/15 00:59:30	1.2
@@ -1,5 +1,6 @@
---- qpsmtpd-0.40/plugins/virus/clamav.clamav_fix	2007-06-14 11:57:23.000000000 -0600
-+++ qpsmtpd-0.40/plugins/virus/clamav	2007-06-14 13:55:41.000000000 -0600
+diff -Nur -x '*.orig' -x '*.rej' qpsmtpd-0.40/plugins/virus/clamav mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamav
+--- qpsmtpd-0.40/plugins/virus/clamav	2007-06-14 11:57:23.000000000 -0600
++++ mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamav	2007-06-14 17:46:23.000000000 -0600
 @@ -139,6 +139,9 @@
      elsif (/back_compat/) {
  	$self->{_back_compat} = '-i --max-recursion=50';
@@ -26,17 +27,15 @@
      return (DECLINED);
    }
    if ($result == 1) {
-@@ -213,8 +218,13 @@
-         return (DENY, "Virus Found: $output");
-     }
+@@ -215,6 +220,11 @@
    }
-+  else {
-+    $transaction->header->add( 'X-Virus-Checked',
-+        "Checked by ClamAV on " . $self->qp->config("me") );
-+  }
    elsif ($result) {
      $self->log(LOGERROR, "ClamAV error: $cmd: $result\n");
 +    return (DENYSOFT) if (!$self->{_declined_on_fail});
++  }
++  else {
++    $transaction->header->add( 'X-Virus-Checked',
++        "Checked by ClamAV on " . $self->qp->config("me") );
    }
    return (DECLINED);
  }