summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-11-02 08:45:02 -0200
committerRenato Botelho <garga@FreeBSD.org>2013-11-02 08:48:05 -0200
commit23b5b16ac6b4107b5321c4e06dfc2b56fa565f20 (patch)
tree463b105c1c16610f0f580300549de5d9872ab005
parentc5d4d97bab489c5884331e0f36930a4e7aaa78c8 (diff)
downloadpfsense-23b5b16ac6b4107b5321c4e06dfc2b56fa565f20.zip
pfsense-23b5b16ac6b4107b5321c4e06dfc2b56fa565f20.tar.gz
Revert "Add conf_mount_rw calls on functions that changes user/groups. It fixes #3294"
This reverts commit b1e5a286bb47d7e4a5b3d589cc27b557b3b13c41.
-rw-r--r--etc/inc/auth.inc12
1 files changed, 0 insertions, 12 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index c4a3ae8..67fd8b1 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -485,8 +485,6 @@ function local_user_set(& $user) {
function local_user_del($user) {
global $debug;
- conf_mount_rw();
-
/* remove all memberships */
local_user_set_groups($user);
@@ -514,8 +512,6 @@ function local_user_del($user) {
/* Delete user from groups needs a call to write_config() */
local_group_del_user($user);
-
- conf_mount_ro();
}
function local_user_set_password(& $user, $password) {
@@ -621,8 +617,6 @@ function local_group_del_user($user) {
function local_group_set($group, $reset = false) {
global $debug;
- conf_mount_rw();
-
$group_name = $group['name'];
$group_gid = $group['gid'];
$group_members = "''";
@@ -647,23 +641,17 @@ function local_group_set($group, $reset = false) {
log_error(sprintf(gettext("Running: %s"), $cmd));
mwexec($cmd);
- conf_mount_ro();
-
}
function local_group_del($group) {
global $debug;
- conf_mount_rw();
-
/* delete from group db */
$cmd = "/usr/sbin/pw groupdel {$group['name']}";
if($debug)
log_error(sprintf(gettext("Running: %s"), $cmd));
mwexec($cmd);
-
- conf_mount_ro();
}
function ldap_test_connection($authcfg) {
OpenPOWER on IntegriCloud