[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1219-g265ffe0

[Jeremy Allison]

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

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


- Log -----------------------------------------------------------------
commit 265ffe01f2ddc241af968f3e41ceb6f4311464eb
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 22 02:54:11 2009 -0700

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

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

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


Changeset truncated at 500 lines:

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 9ffbd57..74f9b94 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;
 }
 


-- 
Samba Shared Repository