From: Jeremy Allison <jra@samba.org>
Date: Wed, 22 Apr 2009 09:55:47 +0000 (-0700)
Subject: Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but... 
X-Git-Tag: samba-3.0.36~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d4943a762377b57d5d15b368315c6f35fabf44f;p=thirdparty%2Fsamba.git

Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
(cherry picked from commit 448d6cd32c793d04c3c509200bfaa75f466a0ee5)
---

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 65f13cd7810..ace95f0a274 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -112,6 +112,10 @@ static int ldap_search_with_timeout(LDAP *ld,
 	if (gotalarm != 0)
 		return LDAP_TIMELIMIT_EXCEEDED;
 
+	if (res == NULL) {
+		return LDAP_TIMELIMIT_EXCEEDED;
+	}
+
 	return result;
 }