diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-09 07:59:38 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-09 07:59:38 -0300 |
| commit | 4a0a7f8d47a33abf428b6c43cf56297807b4e4ab (patch) | |
| tree | c847f2b8a4fdf6c9ea7f7e39be8752caf3794d67 /config | |
| parent | 94a19e81399de604f6cb4d34ffd18fb5e2751a6e (diff) | |
| parent | 39e110048e2d5dc2a26cb31911553d4b1688f8f4 (diff) | |
| download | pfsense-packages-4a0a7f8d47a33abf428b6c43cf56297807b4e4ab.tar.gz pfsense-packages-4a0a7f8d47a33abf428b6c43cf56297807b4e4ab.tar.bz2 pfsense-packages-4a0a7f8d47a33abf428b6c43cf56297807b4e4ab.zip | |
Merge pull request #1054 from doktornotor/patch-5
Diffstat (limited to 'config')
| -rw-r--r-- | config/squid/squid.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 48a92a75..27bff27b 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -210,9 +210,11 @@ function squid_install_command() { /* create cache */ 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")) exec("/bin/chmod a+x " . SQUID_LOCALBASE . "/libexec/squid/pinger"); + exec("/bin/chmod u+s " . SQUID_LOCALBASE . "/libexec/squid/pinger"); if(file_exists(SQUID_LOCALBASE . "/etc/rc.d/squid")) exec("/bin/rm " . SQUID_LOCALBASE . "/etc/rc.d/squid"); squid_write_rcfile(); @@ -1096,9 +1098,11 @@ function squid_resync() { squid_resync_users(); squid_write_rcfile(); - /* make sure pinger is executable */ + /* make sure pinger is executable and suid root */ + // XXX: Bug #5114 if(file_exists(SQUID_LOCALBASE . "/libexec/squid/pinger")) - exec("chmod a+x " . SQUID_LOCALBASE . "/libexec/squid/pinger"); + exec("/bin/chmod a+x " . SQUID_LOCALBASE . "/libexec/squid/pinger"); + exec("/bin/chmod u+s " . SQUID_LOCALBASE . "/libexec/squid/pinger"); foreach (array( SQUID_CONFBASE, SQUID_ACLDIR, |