From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 19 Sep 2008 07:31:24 +0000 (+0000)
Subject: Updated functions.inc
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=de94557dccb8242f866fb7e3b56c24efab483b51;p=gosa.git

Updated functions.inc
-Fixed ou mapping for groups and users
Updated plugin.inc
-Fixed copy method for referals.


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

diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index e208621de..c5a43af17 100644
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -790,7 +790,7 @@ class plugin
       ldap_set_rebind_proc($ds, array(&$this, "rebind"));
     }
 
-    $r=ldap_bind($ds,$this->config->current['ADMIN'], $this->config->current['PASSWORD']);
+    $r=ldap_bind($ds,$this->config->current['ADMINDN'], $this->config->current['ADMINPASSWORD']);
     $sr=ldap_read($ds, @LDAP::fix($src_dn), "objectClass=*");
 
     /* Fill data from LDAP */
diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 9c2bbe840..75a066601 100644
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1213,19 +1213,19 @@ function get_ou($name)
 
 function get_people_ou()
 {
-  return (get_ou("USERRDN"));
+  return (get_ou("userRDN"));
 }
 
 
 function get_groups_ou()
 {
-  return (get_ou("GROUPRDN"));
+  return (get_ou("groupRDN"));
 }
 
 
 function get_winstations_ou()
 {
-  return (get_ou("SAMBAMACHINEACCOUNTRDN"));
+  return (get_ou("sambaMachineAccountRDN"));
 }