From 5dd39505942efd92433cefe9bdd02b46ca1ae180 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 3 Jun 2015 14:24:48 +0200 Subject: [PATCH] Ldap\Connection: Disable server side sorting as it's not working refs #9364 --- library/Icinga/Protocol/Ldap/Connection.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php index e0a02037f..c2758154a 100644 --- a/library/Icinga/Protocol/Ldap/Connection.php +++ b/library/Icinga/Protocol/Ldap/Connection.php @@ -283,7 +283,7 @@ class Connection implements Selectable $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()) { ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array( array( @@ -379,7 +379,7 @@ class Connection implements Selectable $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()) { ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array( array( @@ -531,6 +531,8 @@ class Connection implements Selectable * @param array $sortRules * * @return string + * + * @todo Produces an invalid stream, obviously */ protected function encodeSortRules(array $sortRules) {