git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae084f5
)
Add comment explaining the previous fix.
author
Jeremy Allison
<jra@samba.org>
Wed, 22 Apr 2009 10:04:22 +0000
(
03:04
-0700)
committer
Karolin Seeger
<kseeger@samba.org>
Tue, 2 Jun 2009 10:41:52 +0000
(12:41 +0200)
Jeremy.
(cherry picked from commit
9da82269dc6d9da3c0393a85e0217bf22cd2fe5c
)
source/libads/ldap.c
patch
|
blob
|
history
diff --git
a/source/libads/ldap.c
b/source/libads/ldap.c
index 8c37bfb69e00ab56c09876a0721eb85e53bbe78f..d8a117888eaefe4a0cce045f74f034f183a5b6e2 100644
(file)
--- a/
source/libads/ldap.c
+++ b/
source/libads/ldap.c
@@
-118,6
+118,12
@@
static int ldap_search_with_timeout(LDAP *ld,
if (gotalarm != 0)
return LDAP_TIMELIMIT_EXCEEDED;
+ /*
+ * A bug in OpenLDAP means ldap_search_ext_s can return
+ * LDAP_SUCCESS but with a NULL res pointer. Cope with
+ * this. See bug #6279 for details. JRA.
+ */
+
if (*res == NULL) {
return LDAP_TIMELIMIT_EXCEEDED;
}