[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1220-ge7466d0

[Jeremy Allison]

The branch, master has been updated
       via  e7466d020722ff6da3e6dc29cf5fa621aa039f7e (commit)
      from  265ffe01f2ddc241af968f3e41ceb6f4311464eb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e7466d020722ff6da3e6dc29cf5fa621aa039f7e
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 22 03:03:04 2009 -0700

    Add comment explaining the previous fix.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/libads/ldap.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 74f9b94..cc72d81 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -118,6 +118,12 @@ static int ldap_search_with_timeout(LDAP *ld,
 	if (gotalarm != 0)
 		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;
 	}


-- 
Samba Shared Repository