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

Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
---

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 9ffbd57e4a1..74f9b94a12c 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -118,6 +118,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;
 }