From 2d110f25f73ddf628542e38e759e52fba71162a3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 9 Nov 2012 22:53:56 +0100 Subject: [PATCH] LDAP: check if search was successful (fixes a PHP warning), provide meaningful log output --- apps/user_ldap/lib/access.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index b8e50d8036d..e24f0458f26 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -516,6 +516,12 @@ abstract class Access { $link_resource = $this->connection->getConnectionResource(); if(is_resource($link_resource)) { $sr = ldap_search($link_resource, $base, $filter, $attr); + if(!is_resource($sr)) { + $errmsg = '('.ldap_errno($link_resource).') ' . ldap_error($link_resource); + $errmsg .= ', search filter: ' . $filter; + \OCP\Util::writeLog('user_ldap', 'Search: no result resource, LDAP error message: ' . $errmsg, \OCP\Util::ERROR); + return array(); + } $findings = ldap_get_entries($link_resource, $sr ); // if we're here, probably no connection resource is returned.