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 a21d00dc82e902878609a70724d08756309e7989..a0cf24ac68f471b83bcb55f6e26ffc524e8cf672 100644 (file)
--- 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 c24f100f06db46e18e03179de982bf3b060dba37..3161f42c45e46f68d623a72b8e681685ad4319e9 100644 (file)
--- 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;