Added default winstation ou to avoid errors if not set in config.

[gosa.git] / gosa-core / include / class_ldap.inc

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 3c52101f9d979f59f81d45b4684b51e7e75baedd..6af377218add9ef4562a5ccf76858426a92b4d81 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -451,6 +451,9 @@ class LDAP{
    */
   function rename_dn($source,$dest)
   {
+    $source = LDAP::fix($source);
+    $dest = LDAP::fix($dest);
+
     /* Check if source and destination are the same entry */
     if(strtolower($source) == strtolower($dest)){
       trigger_error("Source and destination can't be the same entry.");
@@ -1204,11 +1207,7 @@ class LDAP{
     }
        
          # Get base to look for schema 
-         $sr = @ldap_read ($this->cid, NULL, "objectClass=*", array("subschemaSubentry"));
-    if(!$sr){
-           $sr = @ldap_read ($this->cid, "", "objectClass=*", array("subschemaSubentry"));
-    }
-
+         $sr = @ldap_read ($this->cid, "", "objectClass=*", array("subschemaSubentry"));
          $attr = @ldap_get_entries($this->cid,$sr);
          if (!isset($attr[0]['subschemasubentry'][0])){
            return array();
@@ -1268,6 +1267,7 @@ class LDAP{
     if(class_available("session")){
       session::set("LDAP_CACHE::get_objectclasses",$objectclasses);
     }
+
          return $objectclasses;
   }