Commit ae4e38bc authored by Franco Fichtner's avatar Franco Fichtner

ldap: auth containers are not appended to base dn

Still need to fix the help text in the server settings.
parent d870e03d
...@@ -126,22 +126,9 @@ class LDAP implements IAuthConnector ...@@ -126,22 +126,9 @@ class LDAP implements IAuthConnector
{ {
$result = false; $result = false;
if ($this->ldapHandle != null) { if ($this->ldapHandle != null) {
$searchpaths = array(); $searchpaths = array($this->baseSearchDN);
if (!empty($this->ldapAuthcontainers)) { if (!empty($this->ldapAuthcontainers)) {
/* prepend each authentication container */ $searchpaths = explode(';', $this->ldapAuthcontainers);
foreach (explode(';', $this->ldapAuthcontainers) as $container) {
$searchpath = array();
if (!empty($container)) {
$searchpath[] = $container;
}
if (!empty($this->baseSearchDN)) {
$searchpath[] = $this->baseSearchDN;
}
$searchpaths[] = implode(',', $searchpath);
}
} else {
/* use a single base DN */
$searchpaths[] = $this->baseSearchDN;
} }
foreach ($searchpaths as $baseDN) { foreach ($searchpaths as $baseDN) {
if ($this->ldapScope == 'one') { if ($this->ldapScope == 'one') {
......
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