This should be a NotFound exception.

horde · Jan 13, 2017 · 78bbe2d · 78bbe2d
1 parent edff052
commit 78bbe2d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docs/CHANGES b/docs/CHANGES
@@ -2,6 +2,8 @@
 v4.2.19-git
 -----------
 
+[jan] Fix fatal error if group contacts from an LDAP server don't exist
+      anymore.
 
 
 -------

diff --git a/lib/Driver/Ldap.php b/lib/Driver/Ldap.php
@@ -538,13 +538,13 @@ protected function _buildSearchQuery(array $criteria)
      * @param resource $res     Result identifier.
      *
      * @return array  Hash containing the results.
-     * @throws Turba_Exception
+     * @throws Horde_Exception_NotFound
      */
     protected function _getResults(array $fields, $res)
     {
         $entries = @ldap_get_entries($this->_ds, $res);
         if ($entries === false) {
-            throw new Turba_Exception(sprintf(_("Read failed: (%s) %s"), ldap_errno($this->_ds), ldap_error($this->_ds)));
+            throw new Horde_Exception_NotFound(sprintf(_("Read failed: (%s) %s"), ldap_errno($this->_ds), ldap_error($this->_ds)));
         }
 
         /* Return only the requested fields (from $fields, above). */

diff --git a/package.xml b/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
-* 
+* [jan] Fix fatal error if group contacts from an LDAP server don&apos;t exist anymore.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2178,7 +2178,7 @@
    <date>2016-12-16</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
-* 
+* [jan] Fix fatal error if group contacts from an LDAP server don&apos;t exist anymore.
    </notes>
   </release>
  </changelog>