aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/mailscanner/mailscanner.inc15
1 files changed, 10 insertions, 5 deletions
diff --git a/config/mailscanner/mailscanner.inc b/config/mailscanner/mailscanner.inc
index 8418c85c..62905091 100644
--- a/config/mailscanner/mailscanner.inc
+++ b/config/mailscanner/mailscanner.inc
@@ -33,11 +33,16 @@ require_once("globals.inc");
#require("guiconfig.inc");
$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m"));
-if ($pf_version == "2.1")
- define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX);
-else
- define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX . '/local');
+if ($pf_version == "2.1" || $pf_version == "2.2") {
+ define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m"));
+ if ($pf_version == "2.1")
+ define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX);
+ else
+ define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX . '/local');
+} else {
+ define('MAILSCANNER_PREFIX', '/usr/local');
+ define('MAILSCANNER_LOCALBASE', '/usr/local');
+}
$uname=posix_uname();
if ($uname['machine']=='amd64')