Changeset 224 for branches/samba-3.3.x/source/libads/ldap.c

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

File:

• branches/samba-3.3.x/source/libads/ldap.c (modified) (1 diff)

branches/samba-3.3.x/source/libads/ldap.c

@@ -119 +119 @@
                 return LDAP_TIMELIMIT_EXCEEDED;
 
+        /*
+         * A bug in OpenLDAP means ldap_search_ext_s can return
+         * LDAP_SUCCESS but with a NULL res pointer. Cope with
+         * this. See bug #6279 for details. JRA.
+         */
+
+        if (*res == NULL) {
+                return LDAP_TIMELIMIT_EXCEEDED;
+        }
+
         return result;
 }