diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-22 02:55:47 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-07-30 09:22:13 +0200 |
| commit | 4d4943a762377b57d5d15b368315c6f35fabf44f (patch) | |
| tree | 1ef3c44500cafd8e142259ae64540becd9978171 | |
| parent | 3df3c08071f690c8e9aca88da2eea8aed88473cd (diff) | |
| download | samba-4d4943a762377b57d5d15b368315c6f35fabf44f.tar.gz | |
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
(cherry picked from commit 448d6cd32c793d04c3c509200bfaa75f466a0ee5)
| -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 65f13cd7810..ace95f0a274 100644 --- a/source/libads/ldap.c +++ b/source/libads/ldap.c @@ -112,6 +112,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; } |