Fix strict error on ldap auth-fail, ldap is default auth now

refs #3769
refs #4463
This commit is contained in:
Jannis Moßhammer 2013-07-26 15:29:13 +02:00
parent 306a51271b
commit 845654b77f
2 changed files with 22 additions and 8 deletions

View File

@ -1,14 +1,28 @@
[users] [users]
backend=ldap
hostname=localhost
root_dn="ou=people,dc=icinga,dc=org"
bind_dn="cn=admin,cn=config"
bind_pw=admin
user_class=inetOrgPerson
user_name_attribute=uid
[users-mysql]
backend=Db backend=Db
dbtype=pgsql dbtype=mysql
table=account table=account
host=localhost host=localhost
password=icinga password=icinga
user=icingaweb user=icingaweb
db=icingaweb db=icingaweb
root_dn="ou=people,dc=icinga,dc=org"
bind_dn="cn=admin,cn=config" [users-pgsql]
bind_pw=admin backend=Db
user_class=inetOrgPerson dbtype=pgsql
user_name_attribute=uid table=account
host=localhost
password=icinga
user=icingaweb
db=icingaweb

View File

@ -402,9 +402,9 @@ class Connection
// TODO: Is it OK to have no capabilities? // TODO: Is it OK to have no capabilities?
return $cap; return $cap;
} }
$ldapAttributes = ldap_get_attributes($ds, $entry);
$result = $this->cleanupAttributes( $result = $this->cleanupAttributes(
ldap_get_attributes($ds, $entry) $ldapAttributes
); );
/* /*
if (isset($result->dnsHostName)) { if (isset($result->dnsHostName)) {