diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-22 02:55:47 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-22 02:55:47 -0700 |
| commit | 448d6cd32c793d04c3c509200bfaa75f466a0ee5 (patch) | |
| tree | c398a9613371bf0e6e6b479d1fed8d24e3d95a72 | |
| parent | cb29ca98bb1c166ecd806e82c9d13865ae502a65 (diff) | |
| download | samba-448d6cd32c793d04c3c509200bfaa75f466a0ee5.tar.gz samba-448d6cd32c793d04c3c509200bfaa75f466a0ee5.tar.xz samba-448d6cd32c793d04c3c509200bfaa75f466a0ee5.zip | |
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but not returning a result.
Jeremy
| -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; } |