diff --git a/doc/sources/admin/authldap.rst b/doc/sources/admin/authldap.rst index 726256f07..ad53eb7c8 100644 --- a/doc/sources/admin/authldap.rst +++ b/doc/sources/admin/authldap.rst @@ -92,7 +92,8 @@ Connection bind is used. - **Password**: password to used to connect to LDAP server. By default, anonymous bind is used. -- **Timeout**: server idle timeout. +- **Connection timeout**: applies only when initiating the connection +- **Operation timeout**: applies to all LDAP operations - **Version**: LDAP protocol version. - **Binary attributes**: regular expression matching binary attributes (see diff --git a/doc/sources/admin/parameterlist.rst b/doc/sources/admin/parameterlist.rst index 6245a571a..4dbba5f33 100644 --- a/doc/sources/admin/parameterlist.rst +++ b/doc/sources/admin/parameterlist.rst @@ -241,6 +241,7 @@ ldapSearchDeref "deref" param of Net::LD ldapServer LDAP server (host or URI) ✔ ldapSetPassword ✔ ldapTimeout LDAP connection timeout ✔ +ldapIOTimeout LDAP operation timeout ✔ ldapUsePasswordResetAttribute LDAP store reset flag in an attribute ✔ ldapVerify Whether to validate LDAP certificates ✔ ldapVersion LDAP protocol version ✔