From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 11 Jan 2007 03:55:31 +0000 (+0000)
Subject: Skip changing password storage method, if user is not allowed to change it
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=736d029eecd7cfa5363cf315f59ded40ba35ffa6;p=gosa.git

Skip changing password storage method, if user is not allowed to change it


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5519 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index a21d00dc8..a0cf24ac6 100644
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -229,6 +229,7 @@ $ACLD['user']=       array("academicTitle",
 			"personalTitle",
 			"postalAddress",
 			"postalCode",
+			"passwordStorage",
 			"publicVisible",
 			"role",
 			"roomNumber",
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index c24f100f0..3161f42c4 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -655,7 +655,8 @@ class user extends plugin
       /* Save base and pw_storage, since these are no LDAP attributes */
       if (isset($_POST['base'])){
         foreach(array("base", "pw_storage") as $val){
-          if(isset($_POST[$val])){
+
+          if(isset($_POST[$val]) && chkacl ($this->acl, "$val") == ""){
             $data= validate($_POST[$val]);
             if ($data != $this->$val){
               $this->is_modified= TRUE;