Commit a21149c8 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

Showing with 223 additions and 337 deletions
+223 -337
...@@ -111,5 +111,20 @@ class setup_step extends plugin ...@@ -111,5 +111,20 @@ class setup_step extends plugin
return $display; 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 ...@@ -66,16 +66,10 @@ class Step_Schema extends setup_step
* If the root object is missing we can't read any schema informations. * If the root object is missing we can't read any schema informations.
* In this case we should display a message. * In this case we should display a message.
*/ */
$cv = $this->parent->captured_values;
/* Establish ldap connection */ /* Establish ldap connection */
$ldap_l = new LDAP($cv['admin'], $cv = $this->parent->captured_values;
$cv['password'], $ldap = $this->get_ldap_link();
$cv['connection'],
FALSE,
$cv['tls']);
$ldap = new ldapMultiplexer($ldap_l);
/* Check if root object exists */ /* Check if root object exists */
$ldap->cd($cv['base']); $ldap->cd($cv['base']);
......
  • bmortier @bmortier

    mentioned in issue #912

    By Côme Chilliet on 2017-09-02T15:04:08 (imported from GitLab)

    ·

    mentioned in issue #912

    By Côme Chilliet on 2017-09-02T15:04:08 (imported from GitLab)

    Toggle commit list
Supports Markdown
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