qpsmtpd/sme8/qpsmtpd-0.40-denysoft.patch

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-25 15:39:06.000000000 -0600
+++ mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamav 2007-06-25 15:38:42.000000000 -0600
@@ -202,7 +202,7 @@
  
   if ($signal) {
     $self->log(LOGINFO, "clamscan exited with signal: $signal");
-    return (DECLINED);
+    return (DENYSOFT);
   }
   if ($result == 1) {
     $self->log(LOGINFO, "Virus(es) found: $output");
@@ -215,7 +215,11 @@
   }
   elsif ($result) {
     $self->log(LOGERROR, "ClamAV error: $cmd: $result\n");
+    return (DENYSOFT);
   }
+
+  $transaction->header->add( 'X-Virus-Checked',
+      "Checked by ClamAV on " . $self->qp->config("me") );
   return (DECLINED);
 } 
 
diff -Nur -x '*.orig' -x '*.rej' qpsmtpd-0.40/plugins/virus/clamdscan mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamdscan
--- qpsmtpd-0.40/plugins/virus/clamdscan        2007-06-14 11:57:23.000000000 -0600
+++ mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamdscan      2007-06-25 15:38:21.000000000 -0600
@@ -154,8 +154,8 @@
     }
 
     unless ( $clamd->ping() ) {
-    $self->log( LOGERROR, "Cannot ping clamd server - did you provide the correct clamd port or socket?" );
-    return DENYSOFT;
+      $self->log( LOGERROR, "Cannot ping clamd server - did you provide the correct clamd port or socket?" );
+      return DENYSOFT;
     }
 
     if ( my %found = $clamd->scan($filename) ) {
1	slords	1.1	diff -Nur -x '.orig' -x '.rej' qpsmtpd-0.40/plugins/virus/clamav mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamav
2			--- qpsmtpd-0.40/plugins/virus/clamav 2007-06-25 15:39:06.000000000 -0600
3			+++ mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamav 2007-06-25 15:38:42.000000000 -0600
4			@@ -202,7 +202,7 @@
5
6			if ($signal) {
7			$self->log(LOGINFO, "clamscan exited with signal: $signal");
8			- return (DECLINED);
9			+ return (DENYSOFT);
10			}
11			if ($result == 1) {
12			$self->log(LOGINFO, "Virus(es) found: $output");
13			@@ -215,7 +215,11 @@
14			}
15			elsif ($result) {
16			$self->log(LOGERROR, "ClamAV error: $cmd: $result\n");
17			+ return (DENYSOFT);
18			}
19			+
20			+ $transaction->header->add( 'X-Virus-Checked',
21			+ "Checked by ClamAV on " . $self->qp->config("me") );
22			return (DECLINED);
23			}
24
25			diff -Nur -x '.orig' -x '.rej' qpsmtpd-0.40/plugins/virus/clamdscan mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamdscan
26			--- qpsmtpd-0.40/plugins/virus/clamdscan 2007-06-14 11:57:23.000000000 -0600
27			+++ mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamdscan 2007-06-25 15:38:21.000000000 -0600
28			@@ -154,8 +154,8 @@
29			}
30
31			unless ( $clamd->ping() ) {
32			- $self->log( LOGERROR, "Cannot ping clamd server - did you provide the correct clamd port or socket?" );
33			- return DENYSOFT;
34			+ $self->log( LOGERROR, "Cannot ping clamd server - did you provide the correct clamd port or socket?" );
35			+ return DENYSOFT;
36			}
37
38			if ( my %found = $clamd->scan($filename) ) {