diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-20 08:50:55 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-20 08:50:55 +0000 |
| commit | 8b7a31ecc6bde646e36f0c6f81c33f15ed26a85d (patch) | |
| tree | ee940dbdb7f6dc10a9f2d2d0e7867a1805991aad /frontends/php/include | |
| parent | 6553086bcd2e5135a4ffd1721dc702d1dd523866 (diff) | |
| download | zabbix-8b7a31ecc6bde646e36f0c6f81c33f15ed26a85d.tar.gz zabbix-8b7a31ecc6bde646e36f0c6f81c33f15ed26a85d.tar.xz zabbix-8b7a31ecc6bde646e36f0c6f81c33f15ed26a85d.zip | |
- [DEV-137] fixed bug in ldap auth method to LDAP AD (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5719 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/classes/cldap.inc.php | 4 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 |
2 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 be94109e..f9aa112f 100644 --- a/frontends/php/include/classes/cldap.inc.php +++ b/frontends/php/include/classes/cldap.inc.php @@ -88,7 +88,7 @@ class CLdap{ } } // needs version 3 - if(!empty($this->cnf['referrals'])) { + if(!zbx_empty($this->cnf['referrals'])) { if(!ldap_set_option($this->ds, LDAP_OPT_REFERRALS,$this->cnf['referrals'])){ error('Setting LDAP referrals to off failed'); } @@ -196,7 +196,7 @@ class CLdap{ else { $filter = "(ObjectClass=*)"; } - + $sr = ldap_search($this->ds, $base, $filter); $result = ldap_get_entries($this->ds, $sr); diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 14258be4..0a1762cd 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -1268,7 +1268,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! function zbx_empty($var){ if(is_null($var)) return true; - if($var == '') return true; + if($var === '') return true; return false; } |
