[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-163-g448d6cd

[Jeremy Allison]

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

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


- Log -----------------------------------------------------------------
commit 448d6cd32c793d04c3c509200bfaa75f466a0ee5
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 22 02:55:47 2009 -0700

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

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

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


Changeset truncated at 500 lines:

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 65f13cd..ace95f0 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;
 }
 


-- 
Samba Shared Repository