git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3df3c08
)
Fix bug #6279 - winbindd crash. Cope with LDAP libraries returning LDAP_SUCCESS but...
author
Jeremy Allison
<jra@samba.org>
Wed, 22 Apr 2009 09:55:47 +0000
(
02:55
-0700)
committer
Karolin Seeger
<kseeger@samba.org>
Thu, 30 Jul 2009 07:22:13 +0000
(09:22 +0200)
Jeremy
(cherry picked from commit
448d6cd32c793d04c3c509200bfaa75f466a0ee5
)
source/libads/ldap.c
patch
|
blob
|
history
diff --git
a/source/libads/ldap.c
b/source/libads/ldap.c
index 65f13cd7810df1be88adb6f301ebc536c0425dae..ace95f0a2741332d4a66abc442f33fb8a842d622 100644
(file)
--- 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;
}