aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-09 07:59:05 -0300
committerRenato Botelho <renato@netgate.com>2015-09-09 07:59:05 -0300
commit94a19e81399de604f6cb4d34ffd18fb5e2751a6e (patch)
treeb2d7b0ac929e9c672fe818b72d5f57848ad42a1c /config
parent9b86077a929e727fe7d86fb8ed8d831e602fdd2d (diff)
parentbca9c324b12ca25bd87b4390852fd188f1a00b23 (diff)
downloadpfsense-packages-94a19e81399de604f6cb4d34ffd18fb5e2751a6e.tar.gz
pfsense-packages-94a19e81399de604f6cb4d34ffd18fb5e2751a6e.tar.bz2
pfsense-packages-94a19e81399de604f6cb4d34ffd18fb5e2751a6e.zip
Merge pull request #1053 from doktornotor/patch-2
Diffstat (limited to 'config')
-rwxr-xr-xconfig/squid3/34/squid.inc11
1 files changed, 6 insertions, 5 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