Changeset 312 for branches/samba-3.0/source/libads/ldap.c

Timestamp:

Aug 5, 2009, 6:34:45 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.0 to final 3.0.36 (source)

File:

• branches/samba-3.0/source/libads/ldap.c (modified) (3 diffs)

branches/samba-3.0/source/libads/ldap.c

@@ -113 +113 @@
                 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;
 }
@@ -276 +287 @@
                 got_realm = True;
                    
+ again:
+
         /* we need to try once with the realm name and fallback to the 
            netbios domain name if we fail (if netbios has not been disabled */
@@ -326 +339 @@
 
         sitename = sitename_fetch(realm);
-
- again:
 
         DEBUG(6,("ads_find_dc: (cldap) looking for %s '%s'\n",