From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 18 Aug 2009 08:09:31 +0000 (+0000)
Subject: Removed most of the unnessessary code, fixed roles and added posix groups (Closes... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ba15f3571a99a0972c7deaeb914ec38852406a8c;p=gosa.git

Removed most of the unnessessary code, fixed roles and added posix groups (Closes: #674)


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

diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index af6b60b1d..aaf246229 100644
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -944,17 +944,11 @@ class plugin
       $this->update_acls($old_dn,$new_dn); 
     }
 
-    /* Get all objectGroups defined in this database. 
-        and check if there is an entry matching the source dn,
-        if this is the case, then update this objectgroup to use the new dn.
-     */
-    $ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","ogroups",
-        array(get_ou("ogroupRDN")),$this->config->current['BASE'],array("member"),
-        GL_SUBSEARCH | GL_NO_ACL_CHECK) ;
+    // Migrate objectgroups if needed
+    $ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","ogroups", array(get_ou("ogroupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK);
 
-    // Walk through all objectGroups and check if there are members matching the source dn
+    // Walk through all objectGroups
     foreach($ogroups as $ogroup){
-
       // Migrate old to new dn
       $o_ogroup= new ogroup($this->config,$ogroup['dn']);
       unset($o_ogroup->member[$src_dn]);
@@ -964,15 +958,27 @@ class plugin
       $o_ogroup->save();
     }
 
-    /* Update roles to use the new entry dn
-     */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->config->current['BASE']);
-    $ldap->search("(&(objectClass=organizationalRole)".
-        "(roleOccupant=".LDAP::prepare4filter($src_dn)."))");
-    while($attrs = $ldap->fetch()){
-      $role = new roleGeneric($this->config,$attrs['dn']);
-      $key = array_search($src_dn,$role->roleOccupant); 
+    // Migrate rfc groups if needed
+    $groups = get_sub_list("(&(objectClass=posixGroups)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","groups", array(get_ou("groupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK);
+
+    // Walk through all POSIX groups
+    foreach($groups as $group){
+      // Migrate old to new dn
+      $o_group= new group($this->config,$group['dn']);
+      unset($o_group->member[$src_dn]);
+      $o_group->member[$dst_dn]= $dst_dn;
+      
+      // Save object group
+      $o_group->save();
+    }
+
+    /* Update roles to use the new entry dn */
+    $roles = get_sub_list("(&(objectClass=organizationalRole)(roleOccupant=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","roles", array(get_ou("roleRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK);
+
+    // Walk through all roles
+    foreach($roles as $role){
+      $role = new roleGeneric($this->config,$role['dn']);
+      $key= array_search($src_dn, $role->roleOccupant);      
       if($key !== FALSE){
         $role->roleOccupant[$key] = $dst_dn;
         $role->save();