[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-805-g0b0bb2c

[Jeremy Allison]

The branch, v3-4-test has been updated
       via  0b0bb2c7eb44b403e6fd50cf480ed8b2fb24a7d5 (commit)
      from  9ebc15bed8c05d0729066d97d3bfaade9fcbacb7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 0b0bb2c7eb44b403e6fd50cf480ed8b2fb24a7d5
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 d35a499..2013344 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