[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3563-ge7687dd
Jeremy Allison
jra at samba.org
Wed Apr 22 09:25:59 GMT 2009
The branch, v3-2-test has been updated
via e7687dd9ca244a53fdf2312a78cdb028dd8971d5 (commit)
from b9395cb807b7c2a72ec6ba3cb7429bd2add79c54 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit e7687dd9ca244a53fdf2312a78cdb028dd8971d5
Author: Jeremy Allison <jra at samba.org>
Date: Wed Apr 22 02:24:27 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 9eae2d4..8c37bfb 100644
--- a/source/libads/ldap.c
+++ b/source/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
More information about the samba-cvs
mailing list