X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_ldap.inc;h=6ae00e89623831ee284932bf2f6f8a8f13cb2410;hb=04cf3914433415713303361dcdef3bf864d98444;hp=087dd265e9ccae9a3a259b66c40063ae4f495240;hpb=71164a7278ea9607f9a22173ee67304baa48ce95;p=gosa.git
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 087dd265e..6ae00e896 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -573,7 +573,7 @@ class LDAP{
}
if($this->error != "Success"){
- /* Some error occured */
+ /* Some error occurred */
print "---------------------------------------------";
print $this->get_error()."
";
print $sourcedn."
";
@@ -772,6 +772,7 @@ class LDAP{
}
$this->cd($cdn);
$this->add($na);
+
show_ldap_error($this->get_error(), sprintf(_("Creating subtree '%s' failed."),$cdn));
if (!preg_match('/success/i', $this->error)){
return FALSE;
@@ -1111,6 +1112,13 @@ class LDAP{
*/
function import_single_entry($str_attr,$modify,$delete)
{
+ global $config;
+
+ if(!$config){
+ trigger_error("Can't import ldif, can't read config object.");
+ }
+
+
if($this->reconnect) $this->connect();
$ret = false;
@@ -1188,7 +1196,8 @@ class LDAP{
/* Create missing trees */
$this->cd ($this->basedn);
- $this->create_missing_trees($data['dn']);
+ $this->cd($config->current['BASE']);
+ $this->create_missing_trees(preg_replace("/^[^,]+,/","",$data['dn']));
$this->cd($data['dn']);
$dn = $data['dn'];
@@ -1253,7 +1262,15 @@ class LDAP{
function get_objectclasses()
{
$objectclasses = array();
-
+ global $config;
+
+ /* Only read schema if it is allowed */
+ if(isset($config) && preg_match("/config/i",get_class($config))){
+ if(!isset($config->data['MAIN']['SCHEMA_CHECK']) || !preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){
+ return($objectclasses);
+ }
+ }
+
# Get base to look for schema
$sr = @ldap_read ($this->cid, NULL, "objectClass=*", array("subschemaSubentry"));
if(!$sr){
@@ -1316,7 +1333,6 @@ class LDAP{
}
}
-
return $objectclasses;
}
@@ -1369,8 +1385,18 @@ class LDAP{
function get_naming_contexts($server, $admin= "", $password= "")
{
- $attr= $this->get_root_dse($server, $admin, $password);
-
+ /* Build LDAP connection */
+ $ds= ldap_connect ($server);
+ if (!$ds) {
+ die ("Can't bind to LDAP. No check possible!");
+ }
+ ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+ $r= ldap_bind ($ds, $admin, $password);
+
+ /* Get base to look for naming contexts */
+ $sr = @ldap_read ($ds, "", "objectClass=*", array("+"));
+ $attr= @ldap_get_entries($ds,$sr);
+
return ($attr[0]['namingcontexts']);
}
@@ -1389,9 +1415,19 @@ class LDAP{
$sr = @ldap_read ($ds, "", "objectClass=*", array("+"));
$attr= @ldap_get_entries($ds,$sr);
- print_a($attr);
+ /* Return empty array, if nothing was set */
+ if (!isset($attr[0])){
+ return array();
+ }
+
+ /* Rework array... */
+ $result= array();
+ for ($i= 0; $i<$attr[0]['count']; $i++){
+ $result[$attr[0][$i]]= $attr[0][$attr[0][$i]];
+ unset($result[$attr[0][$i]]['count']);
+ }
- return ($attr);
+ return ($result);
}