aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2012-04-15 23:00:46 +0000
committerMarcello Coutinho <marcellocoutinho@gmail.com>2012-04-15 23:00:46 +0000
commit5e6c7206641c79bfd6ab116e7cd41dba21b8b6f8 (patch)
tree913e6bdbe62dd1ce05b0a1118760f900d480e4de
parent5f63099c1a0ee48b71453ec256df6a993f5f7c6b (diff)
downloadpfsense-packages-5e6c7206641c79bfd6ab116e7cd41dba21b8b6f8.tar.gz
pfsense-packages-5e6c7206641c79bfd6ab116e7cd41dba21b8b6f8.tar.bz2
pfsense-packages-5e6c7206641c79bfd6ab116e7cd41dba21b8b6f8.zip
squid3 - fix package integration with squidguard
-rw-r--r--config/squid-reverse/squid.inc5
-rw-r--r--config/squid-reverse/squid.xml1
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 5 insertions, 5 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 08f57b52..408ecb7a 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -1095,14 +1095,15 @@ function squid_resync_auth() {
$settingsnac = $config['installedpackages']['squidnac']['config'][0];
if (is_array($config['installedpackages']['squid']['config']))
$settingsconfig = $config['installedpackages']['squid']['config'][0];
+
$conf = '';
// Package integration
if(!empty($settingsconfig['custom_options']))
- $conf.=preg_replace('/;/',"\n",$settingconfig['custom_options']);
+ $conf.="# Package Integration\n".preg_replace('/;/',"\n",$settingsconfig['custom_options'])."\n\n";
// Custom User Options
- $conf .= "# Custom options\n".sq_text_area_decode($settingsconfig['custom_options_squid3'])."\n";
+ $conf .= "# Custom options\n".sq_text_area_decode($settingsconfig['custom_options_squid3'])."\n\n";
// Deny the banned guys before allowing the good guys
if(! empty($settingsnac['banned_hosts'])) {
diff --git a/config/squid-reverse/squid.xml b/config/squid-reverse/squid.xml
index e0539f38..1c003a27 100644
--- a/config/squid-reverse/squid.xml
+++ b/config/squid-reverse/squid.xml
@@ -373,7 +373,6 @@
<fieldname>custom_options</fieldname>
<description><![CDATA[Squid options added from packages like squidguard or havp for squid integration.]]></description>
<type>textarea</type>
- <encoding>base64</encoding>
<cols>78</cols>
<rows>5</rows>
</field>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 366ee297..43e02cfb 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1010,7 +1010,7 @@
<pkginfolink>http://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
<website>http://www.squid-cache.org/</website>
<category>Network</category>
- <version>3.1.19 pkg 2.0.1</version>
+ <version>3.1.19 pkg 2.0.2</version>
<status>RC1</status>
<required_version>2.0</required_version>
<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index a7e149e2..b329b4cd 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -118,7 +118,7 @@
<pkginfolink>http://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
<website>http://www.squid-cache.org/</website>
<category>Network</category>
- <version>3.1.19 pkg 2.0.1</version>
+ <version>3.1.19 pkg 2.0.2</version>
<status>Stable</status>
<required_version>2.0</required_version>
<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>