[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-5231-gb32b0d5
Jeremy Allison
jra at samba.org
Wed Apr 22 09:50:52 GMT 2009
The branch, v3-3-test has been updated
via b32b0d502fe0f63e82d277039dda0a6f4bb2100f (commit)
from d235881c9f3e5d14beb2ebcfa2e4a7d18e890784 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit b32b0d502fe0f63e82d277039dda0a6f4bb2100f
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 4fb9530..27aef31 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