summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-04-22 02:54:11 -0700
committerJeremy Allison <jra@samba.org>2009-04-22 02:58:24 -0700
commit265ffe01f2ddc241af968f3e41ceb6f4311464eb (patch)
tree0d25ce0bfa9f0282c17f76dcad8e71d21a93e486 /source3/libads
parenta3efd9d797f31c2b94d45f99f4d4af902fd18695 (diff)
downloadsamba-265ffe01f2ddc241af968f3e41ceb6f4311464eb.tar.gz
samba-265ffe01f2ddc241af968f3e41ceb6f4311464eb.tar.bz2
samba-265ffe01f2ddc241af968f3e41ceb6f4311464eb.zip
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
Diffstat (limited to 'source3/libads')
-rw-r--r--source3/libads/ldap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 9ffbd57e4a..74f9b94a12 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;
}