From bcb21f8020f5b886d11aba49bd7b935a6b3cff6f Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 28 Sep 2015 12:35:27 -0400 Subject: Initialize an array before treating it like an array. Fixes #5205 --- config/squid/squid.inc | 10 ++++++++++ pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 4 files changed, 13 insertions(+), 3 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]; diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 728cf50c..e0c0c14e 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1025,7 +1025,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 4.3.9 + 4.3.10 Stable 2.2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 484b6b6b..d854fe6c 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1110,7 +1110,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 2.7.9 pkg v.4.3.9 + 2.7.9 pkg v.4.3.10 Stable 2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 829bd0cf..dc420c6f 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1097,7 +1097,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 2.7.9 pkg v.4.3.9 + 2.7.9 pkg v.4.3.10 Stable 2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3