[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-164-g869b56a

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  869b56a24a1408ea798682b45f9c297341f88ad5 (commit)
      from  448d6cd32c793d04c3c509200bfaa75f466a0ee5 (commit)

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


- Log -----------------------------------------------------------------
commit 869b56a24a1408ea798682b45f9c297341f88ad5
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 22 03:07:37 2009 -0700

    Add comment explaining the previous fix. (and fix the previous patch :-).
    By-hand merge error :-).
    Jeremy.

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

Summary of changes:
 source/libads/ldap.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index ace95f0..7479894 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -112,7 +112,14 @@ static int ldap_search_with_timeout(LDAP *ld,
 	if (gotalarm != 0)
 		return LDAP_TIMELIMIT_EXCEEDED;
 
-	if (res == NULL) {
+
+	/*
+	 * 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