tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/user_base_dn-10402' 

fixes #10402
This commit is contained in:
Johannes Meyer 2015-10-20 11:30:23 +02:00
parent 6c313b816e 0b9a141591
commit 2928d9a98d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
View File

@ -607,7 +607,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
return $this return $this
->setGroupBaseDn($config->base_dn) ->setGroupBaseDn($config->base_dn)
->setUserBaseDn($config->get('user_base_dn', $this->getGroupBaseDn())) ->setUserBaseDn($config->get('user_base_dn', $defaults->get('user_base_dn', $this->getGroupBaseDn())))
->setGroupClass($config->get('group_class', $defaults->group_class)) ->setGroupClass($config->get('group_class', $defaults->group_class))
->setUserClass($config->get('user_class', $defaults->user_class)) ->setUserClass($config->get('user_class', $defaults->user_class))
->setGroupNameAttribute($config->get('group_name_attribute', $defaults->group_name_attribute)) ->setGroupNameAttribute($config->get('group_name_attribute', $defaults->group_name_attribute))