aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3
diff options
context:
space:
mode:
Diffstat (limited to 'config/squid3')
-rw-r--r--config/squid3/31/squid_auth.inc6
-rw-r--r--config/squid3/31/squid_ng.inc4
-rw-r--r--config/squid3/33/squid_auth.inc6
-rwxr-xr-xconfig/squid3/33/squid_ng.inc4
4 files changed, 4 insertions, 16 deletions
diff --git a/config/squid3/31/squid_auth.inc b/config/squid3/31/squid_auth.inc
index 7c99a01b..54e69b49 100644
--- a/config/squid3/31/squid_auth.inc
+++ b/config/squid3/31/squid_auth.inc
@@ -35,8 +35,7 @@ function global_eval_auth_options()
{
global $config;
conf_mount_rw();
- config_lock();
-
+
switch ($config['installedpackages']['squidauth']['config'][0]['auth_method']) {
case "none":
dynamic_auth_content("pkg_edit");
@@ -69,7 +68,6 @@ function global_eval_auth_options()
break;
}
- config_unlock();
conf_mount_ro();
} /* end function global_eval_auth_options */
@@ -443,4 +441,4 @@ function dynamic_auth_content($pkgvar) {
}
} /* end function dynamic_auth_content */
-?> \ No newline at end of file
+?>
diff --git a/config/squid3/31/squid_ng.inc b/config/squid3/31/squid_ng.inc
index 3b9ef405..d1c37dbf 100644
--- a/config/squid3/31/squid_ng.inc
+++ b/config/squid3/31/squid_ng.inc
@@ -38,7 +38,6 @@ function global_write_squid_config()
{
global $config;
conf_mount_rw();
- config_lock();
/* define squid configuration file in variable for replace function */
$squidconfig = "/usr/local/etc/squid/squid.conf";
@@ -791,7 +790,6 @@ function global_write_squid_config()
fclose($fout);
conf_mount_ro();
- config_unlock();
touch($squidconfig);
} /* end function write_squid_config */
@@ -1032,7 +1030,6 @@ function write_static_squid_config() {
function mod_htpasswd() {
global $config;
conf_mount_rw();
- config_lock();
if (!file_exists("/usr/local/etc/squid/advanced/ncsa")) mwexec("mkdir -p /usr/local/etc/squid/advanced/ncsa");
@@ -1048,7 +1045,6 @@ function mod_htpasswd() {
fclose($passfile);
conf_mount_ro();
- config_unlock();
}
function generate_htpasswd($username, $password) {
diff --git a/config/squid3/33/squid_auth.inc b/config/squid3/33/squid_auth.inc
index 7c99a01b..54e69b49 100644
--- a/config/squid3/33/squid_auth.inc
+++ b/config/squid3/33/squid_auth.inc
@@ -35,8 +35,7 @@ function global_eval_auth_options()
{
global $config;
conf_mount_rw();
- config_lock();
-
+
switch ($config['installedpackages']['squidauth']['config'][0]['auth_method']) {
case "none":
dynamic_auth_content("pkg_edit");
@@ -69,7 +68,6 @@ function global_eval_auth_options()
break;
}
- config_unlock();
conf_mount_ro();
} /* end function global_eval_auth_options */
@@ -443,4 +441,4 @@ function dynamic_auth_content($pkgvar) {
}
} /* end function dynamic_auth_content */
-?> \ No newline at end of file
+?>
diff --git a/config/squid3/33/squid_ng.inc b/config/squid3/33/squid_ng.inc
index 3b9ef405..d1c37dbf 100755
--- a/config/squid3/33/squid_ng.inc
+++ b/config/squid3/33/squid_ng.inc
@@ -38,7 +38,6 @@ function global_write_squid_config()
{
global $config;
conf_mount_rw();
- config_lock();
/* define squid configuration file in variable for replace function */
$squidconfig = "/usr/local/etc/squid/squid.conf";
@@ -791,7 +790,6 @@ function global_write_squid_config()
fclose($fout);
conf_mount_ro();
- config_unlock();
touch($squidconfig);
} /* end function write_squid_config */
@@ -1032,7 +1030,6 @@ function write_static_squid_config() {
function mod_htpasswd() {
global $config;
conf_mount_rw();
- config_lock();
if (!file_exists("/usr/local/etc/squid/advanced/ncsa")) mwexec("mkdir -p /usr/local/etc/squid/advanced/ncsa");
@@ -1048,7 +1045,6 @@ function mod_htpasswd() {
fclose($passfile);
conf_mount_ro();
- config_unlock();
}
function generate_htpasswd($username, $password) {