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

Continue to use the original domain for users that login using a domain alias, instead of replacing the domain (that may be an alias domain) with the parent domain name space.

Browse source
This commit is contained in:
Jeroen van Meeuwen (Kolab Systems) 2013-08-03 11:32:26 +01:00
parent 963261269f
commit fecee39d67
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/kolab_auth/kolab_auth_ldap.php
View file

@ -397,7 +397,7 @@ class kolab_auth_ldap extends rcube_ldap_generic
$dc = $r_domain;
}
else {
$user = $usr . '@' . $r_domain;
$dc = 'dc=' . implode(',dc=', explode('.', $r_domain));
}
}
}
@ -458,7 +458,7 @@ class kolab_auth_ldap extends rcube_ldap_generic
return $entry['inetdomainbasedn'];
}
return is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
return is_array($entry[$name_attr]) ? 'dc=' . implode(',dc=', explode('.', $entry[$name_attr][0])) : 'dc=' . implode(',dc=', explode('.', $entry[$name_attr]));
}
}