Updated ACL parsing

-Keep user filter settings when roles are seolved.

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

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 423694c8a7df021ab160120ec0dcd4ff85b21b9e..ce80f8bde57ba788e208c53c486d1778241ea5ed 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -126,6 +126,9 @@ class userinfo
               $tmp = @acl::explodeAcl($attrs['gosaAclTemplate'][$i]);  
 
               foreach($tmp as $new_acl){
+
+                /* Keep non role attributes here! */
+                $new_acl['filter'] = $aclc_value['filter'];
                 $new_acl['members'] = $aclc_value['members'];
                 $aclc[$dn][] =$new_acl;
               }