From 86daa8b8a0eab15e47f6bb29a7e865fb6a668296 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 17 Oct 2008 14:32:30 +0000
Subject: [PATCH] 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
---
 gosa-core/include/class_userinfo.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 423694c8a..ce80f8bde 100644
--- 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;
               }
-- 
2.30.2