Added fix to remove double listed / departments

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

diff --git a/include/class_config.inc b/include/class_config.inc
index 2da80f23c3cc9233654e06c021dbe14836844b52..db13e4ac94acf64ec3827941a71827f981737ccc 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -277,7 +277,7 @@ class config  {
     }
 
     /* Convert BASE to have escaped special characters */
-    $this->current['BASE']= @LDAP::fix($this->current['BASE']);
+    $this->current['BASE']= @LDAP::convert($this->current['BASE']);
 
     /* Parse LDAP referral informations */
     if (!isset($this->current['ADMIN']) || !isset($this->current['PASSWORD'])){

diff --git a/include/functions.inc b/include/functions.inc
index 7c9427a6062cdde50d1e0f189917281ed622daeb..52f0abbfb5840bd2f77394995836315507d4d064 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -836,7 +836,11 @@ function get_departments($ignore_dn= "")
     if ($dn == $ignore_dn){
       continue;
     }
-    $result[convert_department_dn($dn)]= $dn;
+
+    /* Only assign non-root departments */
+    if ($dn != $result['/']){
+      $result[convert_department_dn($dn)]= $dn;
+    }
   }
 
   return ($result);