summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2004-07-26 07:41:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:16 -0500
commitec1bbbf85890dee1fa68046f5c7f15967536079e (patch)
treed0f32077fa98dc447cd27e0cbfad63fdeba2e036 /source3/include
parent2e6f3398d61237e04452530a1415f3e0bd8df3b5 (diff)
downloadsamba-ec1bbbf85890dee1fa68046f5c7f15967536079e.tar.gz
samba-ec1bbbf85890dee1fa68046f5c7f15967536079e.tar.bz2
samba-ec1bbbf85890dee1fa68046f5c7f15967536079e.zip
r1588: This is one of the more pathetic patches I ever checked in. Many hours of
coding have passed, but I could not find a way to get the OpenLDAP libraries to reliably time out on any of the queries we make, *and* get correct error returns. No, async calls and ldap_result does NOT work, or I was simply too stupid to correctly interpret the OpenLDAP manpage and source. We can not allow to hang indefinitely in an ldap query, especially not for winbindd. "ldap timeout" now specifies the overall timeout for the complete operation, that's why I increased that to 15 seconds. Volker (This used to be commit 269f0750872e5f8757e0a9667e007a0410319fcd)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smbldap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index b94577178b..6046af464e 100644
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -154,6 +154,6 @@ struct smbldap_state {
struct smbldap_state;
-#define LDAP_CONNECT_DEFAULT_TIMEOUT 5
+#define LDAP_CONNECT_DEFAULT_TIMEOUT 15
#endif /* _SMBLDAP_H */