aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-09-28 12:35:27 -0400
committerjim-p <jimp@pfsense.org>2015-09-28 12:35:27 -0400
commitbcb21f8020f5b886d11aba49bd7b935a6b3cff6f (patch)
tree69096f3c091571b334a89e8afd901698ae45d335 /config/squid
parent45432e46ab166d2b27f9bef4927cbe2f04b91e63 (diff)
downloadpfsense-packages-bcb21f8020f5b886d11aba49bd7b935a6b3cff6f.tar.gz
pfsense-packages-bcb21f8020f5b886d11aba49bd7b935a6b3cff6f.tar.bz2
pfsense-packages-bcb21f8020f5b886d11aba49bd7b935a6b3cff6f.zip
Initialize an array before treating it like an array. Fixes #5205
Diffstat (limited to 'config/squid')
-rw-r--r--config/squid/squid.inc10
1 files changed, 10 insertions, 0 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 5a0946bb..4cfb9af8 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -926,6 +926,16 @@ EOD;
function squid_resync_auth() {
global $config, $valid_acls;
+ if (!is_array($config['installedpackages']['squidauth'])) {
+ $config['installedpackages']['squidauth']['config'][0] = array();
+ }
+ if (!is_array($config['installedpackages']['squidnac'])) {
+ $config['installedpackages']['squidnac']['config'][0] = array();
+ }
+ if (!is_array($config['installedpackages']['squid'])) {
+ $config['installedpackages']['squid']['config'][0] = array();
+ }
+
$settings = $config['installedpackages']['squidauth']['config'][0];
$settingsnac = $config['installedpackages']['squidnac']['config'][0];
$settingsconfig = $config['installedpackages']['squid']['config'][0];