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:
4d4943a
)
Add comment explaining the previous fix. (and fix the previous patch :-).
author
Jeremy Allison
<jra@samba.org>
Wed, 22 Apr 2009 10:07:37 +0000
(
03:07
-0700)
committer
Karolin Seeger
<kseeger@samba.org>
Thu, 30 Jul 2009 07:22:14 +0000
(09:22 +0200)
By-hand merge error :-).
Jeremy.
(cherry picked from commit
869b56a24a1408ea798682b45f9c297341f88ad5
)
source/libads/ldap.c
patch
|
blob
|
history
diff --git
a/source/libads/ldap.c
b/source/libads/ldap.c
index ace95f0a2741332d4a66abc442f33fb8a842d622..74798943f8468740fa9c01d6b5bba4f10f1e17eb 100644
(file)
--- a/
source/libads/ldap.c
+++ b/
source/libads/ldap.c
@@
-112,7
+112,14
@@
static int ldap_search_with_timeout(LDAP *ld,
if (gotalarm != 0)
return LDAP_TIMELIMIT_EXCEEDED;
- if (res == NULL) {
+
+ /*
+ * 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;
}