Commit d8264038 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes: #2670 Fixed setup so that it works with new ACL format

parent 50fa504f
......@@ -111,5 +111,20 @@ class setup_step extends plugin
return $display;
}
function get_ldap_link()
{
/* Establish ldap connection */
$cv = $this->parent->captured_values;
$ldap_l = new LDAP($cv['admin'],
$cv['password'],
$cv['connection'],
FALSE,
$cv['tls']);
$ldap = new ldapMultiplexer($ldap_l);
$ldap->cd($cv['base']);
return $ldap;
}
}
?>
This diff is collapsed.
......@@ -66,16 +66,10 @@ class Step_Schema extends setup_step
* If the root object is missing we can't read any schema informations.
* In this case we should display a message.
*/
$cv = $this->parent->captured_values;
/* Establish ldap connection */
$ldap_l = new LDAP($cv['admin'],
$cv['password'],
$cv['connection'],
FALSE,
$cv['tls']);
$ldap = new ldapMultiplexer($ldap_l);
$cv = $this->parent->captured_values;
$ldap = $this->get_ldap_link();
/* Check if root object exists */
$ldap->cd($cv['base']);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment