From 774d6ce94aa38c2e6f09c317fd6f4609ab1a9e7b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 15:34:11 +0200
Subject: [PATCH] Fix invalid function call in getCapabilities caused by
refactoring
---
library/Icinga/Protocol/Ldap/LdapCapabilities.php | 5 +++--
library/Icinga/Protocol/Ldap/LdapConnection.php | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/library/Icinga/Protocol/Ldap/LdapCapabilities.php b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
index e98c57818..1ee64eaba 100644
--- a/library/Icinga/Protocol/Ldap/LdapCapabilities.php
+++ b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
@@ -263,14 +263,15 @@ class LdapCapabilities
* Discover the capabilities of the given LDAP server
*
* @param LdapConnection $connection The ldap connection to use
- * @param int $ds The link identifier of the current LDAP connection
*
* @return LdapCapabilities
*
* @throws LdapException In case the capability query has failed
*/
- public static function discoverCapabilities(LdapConnection $connection, $ds)
+ public static function discoverCapabilities(LdapConnection $connection)
{
+ $ds = $connection->getConnection();
+
$fields = array(
'defaultNamingContext',
'namingContexts',
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 099c25006..319293e2a 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -261,7 +261,7 @@ class LdapConnection implements Selectable, Inspectable
{
if ($this->capabilities === null) {
try {
- $this->capabilities = $this->discoverCapabilities($this->getConnection());
+ $this->capabilities = LdapCapabilities::discoverCapabilities($this);
$this->discoverySuccess = true;
} catch (LdapException $e) {
Logger::debug($e);
@@ -1031,7 +1031,7 @@ class LdapConnection implements Selectable, Inspectable
// Try to execute a schema discovery, this may fail if schema discovery is not supported
try {
- $cap = LdapCapabilities::discoverCapabilities($this, $ds);
+ $cap = LdapCapabilities::discoverCapabilities($this);
$infos []= $cap->getVendor();
$version = $cap->getVersion();