From fa7212f29588cdf067428c8c346ca1781396f583 Mon Sep 17 00:00:00 2001
From: marcelloc <marcellocoutinho@gmail.com>
Date: Mon, 5 Dec 2011 20:52:34 -0200
Subject: postfix - include mailscanner package integration

---
 config/postfix/postfix.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'config/postfix/postfix.inc')

diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index d009e72a..5a802054 100644
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -391,8 +391,10 @@ EOF;
 	if($antispam['antispam_enabled']){
 		switch ($antispam['antispam_software']){
 			case "mailscanner":
-			$header_check .= (!preg_match('@/ HOLD@',$header_check)?"\n/^Received:/ HOLD\n":"\n");
-			$postfix_main_antispam = "#Saving all mail after header/body/rbl/spf checks to mailscanner\n\n";
+			if ($antispam['hold_mode']=='auto'){
+				$header_check .= "\n/^Received:/ HOLD\n";
+				$postfix_main_antispam = "#Saving all mail after header/body/rbl/spf checks to mailscanner\n\n";
+				}
 			break;
 			case "policyd2":
 			if ($antispam['antispam_location']){
-- 
cgit v1.2.3