diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-22 03:07:37 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-07-30 09:22:14 +0200 |
| commit | f86dc6a0eaefbda0e83e2c25d5b553356fbf5ca8 (patch) | |
| tree | ca70637cf466a02fec107eec6362ede29725740c | |
| parent | 4d4943a762377b57d5d15b368315c6f35fabf44f (diff) | |
| download | samba-f86dc6a0eaefbda0e83e2c25d5b553356fbf5ca8.tar.gz | |
Add comment explaining the previous fix. (and fix the previous patch :-).
By-hand merge error :-).
Jeremy.
(cherry picked from commit 869b56a24a1408ea798682b45f9c297341f88ad5)
| -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; } |