diff options
| author | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2022-06-17 10:13:02 +0300 |
|---|---|---|
| committer | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2022-06-17 10:13:02 +0300 |
| commit | 227933621a721b3d593faee7c4864b4faf0587b6 (patch) | |
| tree | b1dd89708deb3f99362b92da27074c94edffcf03 | |
| parent | 1a7458d8d365023774f33941b87bf7eb4235286a (diff) | |
| parent | 4c45d9f74154c1700e0b3495e57a8f9673ed41eb (diff) | |
..F....... [ZBXNEXT-7769] added support of PHP 8.1 to LDAP authentication
* commit '4c45d9f74154c1700e0b3495e57a8f9673ed41eb':
.......... [ZBXNEXT-7769] updated changelog message
.......... [ZBXNEXT-7769] added changelog
..F....... [ZBXNEXT-7769] fixed ldap authentication for php 8.1 and above
| -rw-r--r-- | ChangeLog.d/feature/ZBXNEXT-7769 | 1 | ||||
| -rw-r--r-- | ui/include/classes/ldap/CLdap.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog.d/feature/ZBXNEXT-7769 b/ChangeLog.d/feature/ZBXNEXT-7769 new file mode 100644 index 00000000000..6c075e07fec --- /dev/null +++ b/ChangeLog.d/feature/ZBXNEXT-7769 @@ -0,0 +1 @@ +..F....... [ZBXNEXT-7769] added support of PHP 8.1 to LDAP authentication (gcalenko) diff --git a/ui/include/classes/ldap/CLdap.php b/ui/include/classes/ldap/CLdap.php index 5161ada9b9f..17e87f2ffb4 100644 --- a/ui/include/classes/ldap/CLdap.php +++ b/ui/include/classes/ldap/CLdap.php @@ -225,7 +225,7 @@ class CLdap { $filter = '(ObjectClass=*)'; } $sr = @ldap_search($this->ds, $base, $filter); - $result = is_resource($sr) ? @ldap_get_entries($this->ds, $sr) : []; + $result = $sr !== false ? @ldap_get_entries($this->ds, $sr) : []; // don't accept more or less than one response if (!$result || $result['count'] != 1) { |