aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/squid3/34/squid.inc11
-rw-r--r--pkg_config.10.xml2
2 files changed, 7 insertions, 6 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index 57527876..76deb94c 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -306,9 +306,10 @@ function squid_install_command() {
update_status("Creating squid cache pools... One moment please...");
squid_dash_z();
- /* make sure pinger is executable */
+ /* make sure pinger is executable and suid root */
+ // XXX: Bug #5114
if (file_exists(SQUID_LOCALBASE. "/libexec/squid/pinger"))
- @chmod(SQUID_LOCALBASE. "/libexec/squid/pinger", 0755);
+ chmod(SQUID_LOCALBASE. "/libexec/squid/pinger", 4755);
// XXX: Is it really necessary?
if (file_exists("/usr/local/etc/rc.d/squid"))
@@ -1876,10 +1877,10 @@ function squid_resync($via_rpc="no") {
// write config file
file_put_contents(SQUID_CONFFILE, $conf);
- /* make sure pinger is executable */
- // XXX: Is it really necessary? Who could change its permission?
+ /* make sure pinger is executable and suid root */
+ // XXX: Bug #5114
if (file_exists(SQUID_LOCALBASE . "/libexec/squid/pinger"))
- @chmod(SQUID_LOCALBASE. "/libexec/squid/pinger", 0755);
+ chmod(SQUID_LOCALBASE. "/libexec/squid/pinger", 4755);
$log_dir="";
// check if squid is enabled
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index cb87e2a1..9576fa8a 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1052,7 +1052,7 @@
<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
<website>http://www.squid-cache.org/</website>
<category>Network</category>
- <version>0.3.0</version>
+ <version>0.3.1</version>
<status>beta</status>
<required_version>2.2</required_version>
<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>