Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Net_LDAP3::domain_root_dn() instead of find_domain()

Browse source 
Resolves T134
This commit is contained in:
Thomas Bruederli 2015-04-29 14:47:11 +02:00
parent 6effb4c9c3
commit 8caf44ba3c
1 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
plugins/kolab_auth/kolab_auth_ldap.php
View file

@ -408,7 +408,7 @@ class kolab_auth_ldap extends rcube_ldap_generic
list($usr, $dom) = explode('@', $user); list($usr, $dom) = explode('@', $user);
// unrealm domain, user login can contain a domain alias // unrealm domain, user login can contain a domain alias
if ($dom != $domain && ($dc = $this->find_domain($dom))) { if ($dom != $domain && ($dc = $this->domain_root_dn($dom))) {
// @FIXME: we should replace domain in $user, I suppose // @FIXME: we should replace domain in $user, I suppose
} }
} }
@ -434,49 +434,6 @@ class kolab_auth_ldap extends rcube_ldap_generic
return strtr($str, $replaces); return strtr($str, $replaces);
} }
/**
* Find root domain for specified domain
*
* @param string $domain Domain name
*
* @return string Domain DN string
*/
function find_domain($domain)
{
if (empty($domain) || empty($this->config['domain_base_dn']) || empty($this->config['domain_filter'])) {
return null;
}
$base_dn = $this->config['domain_base_dn'];
$filter = $this->config['domain_filter'];
$name_attr = $this->config['domain_name_attribute'];
if (empty($name_attr)) {
$name_attr = 'associateddomain';
}
$filter = str_replace('%s', rcube_ldap_generic::quote_string($domain), $filter);
$result = parent::search($base_dn, $filter, 'sub', array($name_attr, 'inetdomainbasedn'));
if (!$result) {
return null;
}
$entries = $result->entries(true);
$entry_dn = key($entries);
$entry = $entries[$entry_dn];
if (is_array($entry)) {
if (!empty($entry['inetdomainbasedn'])) {
return $entry['inetdomainbasedn'];
}
$domain = is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
return $domain ? 'dc=' . implode(',dc=', explode('.', $domain)) : null;
}
}
/** /**
* Returns variables used for replacement in (last) parse_vars() call * Returns variables used for replacement in (last) parse_vars() call
* *