From 8db744e125d40e337aac6dd51df9cfdf82fc62f9 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Wed, 24 Feb 2016 13:44:57 +0200
Subject: [PATCH] spamassassin: Write X-Spam-Virus header even when connection
 to clamd socket fails.

---
 spamassassin/files/ClamAV.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spamassassin/files/ClamAV.pm b/spamassassin/files/ClamAV.pm
index f0250d4..532f41d 100644
--- a/spamassassin/files/ClamAV.pm
+++ b/spamassassin/files/ClamAV.pm
@@ -80,6 +80,7 @@ sub check_clamav {
 	Type => SOCK_STREAM,
 	Peer => $self->{main}->{conf}->{clamav_socket}
         ) or do {
+            $permsg->set_tag("CLAMAV", "Error");
             info("ClamAV: Failed to connect socket, skipping virus check");
             return;
         };
@@ -97,7 +98,7 @@ sub check_clamav {
 	$permsg->{conf}->{descriptions}->{$rulename} = "Found virus " . $1;
 	$result = 1;
     } elsif ($result =~ /^(.*) ERROR/i) {
-	$permsg->set_tag("CLAMAV", "Error during scanning");
+	$permsg->set_tag("CLAMAV", "Error");
 	info("ClamAV: Error in scanning: " . $1);
 	$result = 0;
     } else {