aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2014-11-18 15:15:39 -0200
committerMarcello Coutinho <marcellocoutinho@gmail.com>2014-11-18 15:15:39 -0200
commitba6565f6b08505fb70f8cec4abec09df42be25f5 (patch)
treeb8b30522c72942208455bbc44909076a6749b512
parentb4b8e8de4e8c3cab2639bf6f1f1dd7a2b14230d2 (diff)
downloadpfsense-packages-ba6565f6b08505fb70f8cec4abec09df42be25f5.tar.gz
pfsense-packages-ba6565f6b08505fb70f8cec4abec09df42be25f5.tar.bz2
pfsense-packages-ba6565f6b08505fb70f8cec4abec09df42be25f5.zip
Mailscanner - remove 2.0 folder check
-rw-r--r--config/mailscanner/mailscanner.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/config/mailscanner/mailscanner.inc b/config/mailscanner/mailscanner.inc
index b6bcc310..31c85a6a 100644
--- a/config/mailscanner/mailscanner.inc
+++ b/config/mailscanner/mailscanner.inc
@@ -1,8 +1,8 @@
<?php
/*
- postfix.inc
+ mailscanner.inc
part of the Postfix package for pfSense
- Copyright (C) 2011-2013 Marcello Coutinho
+ Copyright (C) 2011-2014 Marcello Coutinho
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -33,10 +33,11 @@ require("globals.inc");
#require("guiconfig.inc");
$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version > 2.0)
- define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m"));
+define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m"));
+if ($pf_version == "2.1")
+ define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX);
else
- define('MAILSCANNER_PREFIX','/usr/local');
+ define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX . '/local');
$uname=posix_uname();
if ($uname['machine']=='amd64')