From 58f61c2c8ed377b29b03461977bce207f501ea1d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 11 Aug 2015 12:36:10 +0200 Subject: squid_auth.inc - remove useless config_(un)lock calls This function does nothing but return. --- config/squid/squid_auth.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'config/squid') diff --git a/config/squid/squid_auth.inc b/config/squid/squid_auth.inc index 7c99a01b..54e69b49 100644 --- a/config/squid/squid_auth.inc +++ b/config/squid/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 +?> -- cgit v1.2.3 From a01fc84c0bdf74ab694544dbce34a79dae41c3b5 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 11 Aug 2015 12:39:15 +0200 Subject: squid_ng.inc - remove useless config_(un)lock calls This function does nothing but return. --- config/squid/squid_ng.inc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'config/squid') diff --git a/config/squid/squid_ng.inc b/config/squid/squid_ng.inc index f96c73e4..01f56ea3 100644 --- a/config/squid/squid_ng.inc +++ b/config/squid/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) { -- cgit v1.2.3