diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-25 10:16:41 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-25 10:16:41 -0200 |
| commit | 1b5f6e531fe22e3e0d4477b9f0ef1ffa814ae7de (patch) | |
| tree | 932af712e9cc80fad1c1758a536fd1d18cbb4046 /config | |
| parent | 2a66428bf6ef230ae4249ab1a9dae841b8685e88 (diff) | |
| download | pfsense-packages-1b5f6e531fe22e3e0d4477b9f0ef1ffa814ae7de.tar.gz pfsense-packages-1b5f6e531fe22e3e0d4477b9f0ef1ffa814ae7de.tar.bz2 pfsense-packages-1b5f6e531fe22e3e0d4477b9f0ef1ffa814ae7de.zip | |
Make postfix use wrapper binaries on PBIDIR/bin or PBIDIR/sbin instead of try to use regular binaries from PBIDIR/local/(s)bin. etc is also linked from PBIDIR to PBIDIR/local then it won't break anything. It helps ticket #4018
Diffstat (limited to 'config')
| -rwxr-xr-x | config/postfix/postfix.inc | 5 | ||||
| -rwxr-xr-x | config/postfix/postfix_queue.php | 6 | ||||
| -rw-r--r-- | config/postfix/postfix_view_config.php | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index 99af671b..35087149 100755 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -37,10 +37,7 @@ require_once("globals.inc"); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) { - if ($pfs_version == 2.2) - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local"); - else - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); } else { define('POSTFIX_LOCALBASE','/usr/local'); } diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php index 6f8a7e19..1db2b8e2 100755 --- a/config/postfix/postfix_queue.php +++ b/config/postfix/postfix_queue.php @@ -34,12 +34,8 @@ $uname=posix_uname(); if ($uname['machine']=='amd64') ini_set('memory_limit', '250M'); -$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) { - if ($pfs_version == 2.2) - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local"); - else - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); } else { define('POSTFIX_LOCALBASE','/usr/local'); } diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php index f50ae991..a844ce65 100644 --- a/config/postfix/postfix_view_config.php +++ b/config/postfix/postfix_view_config.php @@ -29,12 +29,8 @@ */ $shortcut_section = "postfix"; require("guiconfig.inc"); -$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) { - if ($pfs_version == 2.2) - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local"); - else - define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); + define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")); } else { define('POSTFIX_LOCALBASE','/usr/local'); } |