diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-22 03:07:37 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-22 03:07:37 -0700 |
| commit | 869b56a24a1408ea798682b45f9c297341f88ad5 (patch) | |
| tree | a1f14dfd478fc1105a94edc4925aa5b8a367c0d2 | |
| parent | 448d6cd32c793d04c3c509200bfaa75f466a0ee5 (diff) | |
| download | samba-869b56a24a1408ea798682b45f9c297341f88ad5.tar.gz samba-869b56a24a1408ea798682b45f9c297341f88ad5.tar.xz samba-869b56a24a1408ea798682b45f9c297341f88ad5.zip | |
Add comment explaining the previous fix. (and fix the previous patch :-).
By-hand merge error :-).
Jeremy.
| -rw-r--r-- | source/libads/ldap.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/libads/ldap.c b/source/libads/ldap.c index ace95f0a274..74798943f84 100644 --- 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; } |