diff options
| author | Björn Jacke <bj@sernet.de> | 2008-05-26 11:29:24 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-06-03 16:32:31 +0200 |
| commit | d8b234648cbc18c02d2c79a32be766080c61b42a (patch) | |
| tree | eaa0b057581b213dc296a5eb6387624e72030536 /source3/include | |
| parent | 8c7e21679b69eab4319efb484630cddfaf973e36 (diff) | |
| download | samba-d8b234648cbc18c02d2c79a32be766080c61b42a.tar.gz samba-d8b234648cbc18c02d2c79a32be766080c61b42a.tar.bz2 samba-d8b234648cbc18c02d2c79a32be766080c61b42a.zip | |
Add ldap connection timeout for OpenLDAP and Netscape LDAP libs. This can be controlled via the ldap connection timeout parameter. This fixes fallbacks to secondary LDAP servers in multi LDAP server setups like in #4544
(This used to be commit 8e59a2fedc940b081222b0e8f90fe0c5a0981c06)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smbldap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index d9d7aca98e..79e0a38b0e 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -220,7 +220,8 @@ const char *smbldap_talloc_dn(TALLOC_CTX *mem_ctx, LDAP *ld, #endif /* HAVE_LDAP */ -#define LDAP_CONNECT_DEFAULT_TIMEOUT 15 +#define LDAP_DEFAULT_TIMEOUT 15 +#define LDAP_CONNECTION_DEFAULT_TIMEOUT 2 #define LDAP_PAGE_SIZE 1024 #endif /* _SMBLDAP_H */ |