tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ldap\Connection: Disable server side sorting as it's not working

Browse Source 
refs #9364
This commit is contained in:
Johannes Meyer 2015-06-03 14:24:48 +02:00
parent 1a0d1702c9
commit 5dd3950594
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Protocol/Ldap/Connection.php
View File

@ -283,7 +283,7 @@ class Connection implements Selectable
$fields = $query->getColumns(); $fields = $query->getColumns();
} }
$serverSorting = $this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID); $serverSorting = false;//$this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
if ($serverSorting && $query->hasOrder()) { if ($serverSorting && $query->hasOrder()) {
ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array( ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
array( array(
@ -379,7 +379,7 @@ class Connection implements Selectable
$fields = $query->getColumns(); $fields = $query->getColumns();
} }
$serverSorting = $this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID); $serverSorting = false;//$this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
if ($serverSorting && $query->hasOrder()) { if ($serverSorting && $query->hasOrder()) {
ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array( ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
array( array(
@ -531,6 +531,8 @@ class Connection implements Selectable
* @param array $sortRules * @param array $sortRules
* *
* @return string * @return string
*
* @todo Produces an invalid stream, obviously
*/ */
protected function encodeSortRules(array $sortRules) protected function encodeSortRules(array $sortRules)
{ {