From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 20 Jun 2008 07:39:15 +0000 (+0000)
Subject: Updated ACL checks for container objects.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc09b08e3b9fa73679fde691dd05dd25b7247346;p=gosa.git

Updated ACL checks for container objects.
-ACL checks work for self ACL objects too.


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

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 2a459c88a..6e039b438 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -289,7 +289,7 @@ class userinfo
 
     /* Push cache answer? */
     $ACL_CACHE = &session::get('ACL_CACHE');
-    if (isset($ACL_CACHE["$dn+$object+$attribute"])){
+    if (0 & isset($ACL_CACHE["$dn+$object+$attribute"])){
 
       /* Remove write if needed */
       if ($skip_write){
@@ -392,6 +392,13 @@ class userinfo
       }
     }
 
+    /* If the requested ACL is for a container object, then alter 
+        ACLs by applying cleanACL a last time.
+     */
+    if(in_array($dn,$this->config->departments)){
+      $acl = $this->cleanACL($acl);
+    }
+
     /* Assemble string */
     $ret= "";
     foreach ($acl as $key => $value){