diff options
| author | marcelloc <marcellocoutinho@gmail.com> | 2011-12-05 20:52:34 -0200 |
|---|---|---|
| committer | marcelloc <marcellocoutinho@gmail.com> | 2011-12-05 20:52:34 -0200 |
| commit | fa7212f29588cdf067428c8c346ca1781396f583 (patch) | |
| tree | d471d8c8cc52d513e4ad296b533074daeb6d4bc5 /config/postfix/postfix.inc | |
| parent | 36b1c7fed9681d40b64d433591dd7717d21ebcf5 (diff) | |
| download | pfsense-packages-fa7212f29588cdf067428c8c346ca1781396f583.tar.gz pfsense-packages-fa7212f29588cdf067428c8c346ca1781396f583.tar.bz2 pfsense-packages-fa7212f29588cdf067428c8c346ca1781396f583.zip | |
postfix - include mailscanner package integration
Diffstat (limited to 'config/postfix/postfix.inc')
| -rw-r--r-- | config/postfix/postfix.inc | 6 |
1 files changed, 4 insertions, 2 deletions
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']){ |