diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-22 02:54:11 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-28 09:11:13 +0200 |
| commit | 4c716b59adfc68ee36ea12f08cc41cf3be2ec542 (patch) | |
| tree | db42346d0582be280c6ca27e3ef4a1030435a5e5 | |
| parent | fe02a9842dacecb0532e4c419789dc82ed053661 (diff) | |
| download | samba-4c716b59adfc68ee36ea12f08cc41cf3be2ec542.tar.gz | |
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
(cherry picked from commit 9ebc15bed8c05d0729066d97d3bfaade9fcbacb7)
| -rw-r--r-- | source3/libads/ldap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 841ea8caae4..d35a49936c8 100644 --- a/source3/libads/ldap.c +++ b/source3/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; } |