diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-31 21:28:48 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-31 21:28:48 -0400 |
| commit | e126e8887597bf0b813309dd5597b18385223859 (patch) | |
| tree | f5df55c21715cc9e3437e3929e011f65a9f38b38 /config/squidGuard | |
| parent | 405cc6f84aa386a4451c38e953a8fa36664106e8 (diff) | |
| parent | dcccb98d5d9dfbf3f3e9a8a2272324dbc3e67ed8 (diff) | |
| download | pfsense-packages-e126e8887597bf0b813309dd5597b18385223859.tar.gz pfsense-packages-e126e8887597bf0b813309dd5597b18385223859.tar.bz2 pfsense-packages-e126e8887597bf0b813309dd5597b18385223859.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/squidGuard')
| -rw-r--r-- | config/squidGuard/squidguard_configurator.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index e57b7597..b900a477 100644 --- a/config/squidGuard/squidguard_configurator.inc +++ b/config/squidGuard/squidguard_configurator.inc @@ -112,9 +112,12 @@ define('REDIRECT_URL_ARGS', '&a=%a&n=%n&i=%i&s=%s&t=%t&u=%u'); # ------------------------------------------------------------------------------ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -if ($pf_version > 2.0) - define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-' . php_uname("m")); -else +if ($pf_version > 2.0) { + if (file_exists('/usr/pbi/squidguard-squid3-' . php_uname("m"))) + define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-squid3-' . php_uname("m")); + else + define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-' . php_uname("m")); +} else define('SQUIDGUARD_LOCALBASE','/usr/local'); if (!defined('SQUID_LOCALBASE') && ($pf_version > 2.0)) |