diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-22 02:24:27 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-06-02 12:41:52 +0200 |
| commit | ae084f570cd0a40162893a756f2cf89e433a11a8 (patch) | |
| tree | 73b7c45f1f44d02c0c8eebe61a41c094d7be94d4 /source | |
| parent | 7fc0e6117152cda961426882b859ecc4cd3ad6de (diff) | |
| download | samba-ae084f570cd0a40162893a756f2cf89e433a11a8.tar.gz samba-ae084f570cd0a40162893a756f2cf89e433a11a8.tar.xz samba-ae084f570cd0a40162893a756f2cf89e433a11a8.zip | |
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
(cherry picked from commit e7687dd9ca244a53fdf2312a78cdb028dd8971d5)
Diffstat (limited to 'source')
| -rw-r--r-- | source/libads/ldap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/libads/ldap.c b/source/libads/ldap.c index 9eae2d4f513..8c37bfb69e0 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; } |