summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/classes
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-06 07:26:29 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-06 07:26:29 +0000
commit37085eb0c73b06780c4f3a34f82693d04a1c2596 (patch)
tree51e03bad55b510f8496958b2eeaa0054c07f3a82 /frontends/php/include/classes
parentb45f01fc040bc1f3f028814f2aab42a995837f20 (diff)
downloadzabbix-37085eb0c73b06780c4f3a34f82693d04a1c2596.tar.gz
zabbix-37085eb0c73b06780c4f3a34f82693d04a1c2596.tar.xz
zabbix-37085eb0c73b06780c4f3a34f82693d04a1c2596.zip
- [DEV-137] small fix to Ldap authentication (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5676 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/classes')
-rw-r--r--frontends/php/include/classes/cldap.inc.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/include/classes/cldap.inc.php b/frontends/php/include/classes/cldap.inc.php
index 6a2bc2ec..be94109e 100644
--- a/frontends/php/include/classes/cldap.inc.php
+++ b/frontends/php/include/classes/cldap.inc.php
@@ -42,7 +42,7 @@ class CLdap{
'mapping'=> array(
'alias'=> 'uid',
- 'userid'=> 'uidnumber',
+ 'userid'=> 'uidnumbera',
'passwd'=> 'userpassword',
),
@@ -216,8 +216,8 @@ class CLdap{
// overwrite if other attribs are specified.
if(is_array($this->cnf['mapping'])){
- foreach($this->cnf['mapping'] as $localkey => $key) {
- $info[$localkey] = $user_result[$key][0];
+ foreach($this->cnf['mapping'] as $localkey => $key){
+ $info[$localkey] = isset($user_result[$key])?$user_result[$key][0]:null;
}
}
$user_result = array_merge($info,$user_result);