From 90b8007935a702bcf9b25c25ad9789242b492c3d Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 6 Apr 2020 16:51:44 +0200 Subject: [PATCH] ldap: fixed ldaps port example to correct number. --- docs/auth/auth-ldap-groups.rst | 2 +- docs/auth/auth-ldap.rst | 2 +- docs/auth/ldap-active-directory.rst | 2 +- rhodecode/authentication/plugins/auth_ldap.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/auth/auth-ldap-groups.rst b/docs/auth/auth-ldap-groups.rst index 85ad1470..9e10cc04 100644 --- a/docs/auth/auth-ldap-groups.rst +++ b/docs/auth/auth-ldap-groups.rst @@ -68,7 +68,7 @@ Below is example setup that can be used with Active Directory and LDAP server wi # Multiple servers can be specified using commas *option*: `port` => `389` - # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL) + # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL) *option*: `timeout` => `300` # Timeout for LDAP connection diff --git a/docs/auth/auth-ldap.rst b/docs/auth/auth-ldap.rst index e43ff8c9..86e82f87 100644 --- a/docs/auth/auth-ldap.rst +++ b/docs/auth/auth-ldap.rst @@ -58,7 +58,7 @@ Below is example setup that can be used with Active Directory/LDAP server:: # Multiple servers can be specified using commas *option*: `port` => `389` - # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL) + # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL) *option*: `timeout` => `300` # Timeout for LDAP connection diff --git a/docs/auth/ldap-active-directory.rst b/docs/auth/ldap-active-directory.rst index 3f53d922..9f3f3031 100644 --- a/docs/auth/ldap-active-directory.rst +++ b/docs/auth/ldap-active-directory.rst @@ -22,7 +22,7 @@ authentication:: # Multiple servers can be specified using commas *option*: `port` => `389` - # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL) + # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL) *option*: `timeout` => `300` # Timeout for LDAP connection diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py index 78a14569..0b0478cf 100644 --- a/rhodecode/authentication/plugins/auth_ldap.py +++ b/rhodecode/authentication/plugins/auth_ldap.py @@ -85,7 +85,7 @@ class AuthLdap(AuthLdapBase): self.TLS_KIND = tls_kind if self.TLS_KIND == 'LDAPS': - port = port or 689 + port = port or 636 self.ldap_server_type += 's' OPT_X_TLS_DEMAND = 2 @@ -249,7 +249,7 @@ class LdapSettingsSchema(AuthnPluginSettingsSchemaBase): colander.Int(), default=389, description=_('Custom port that the LDAP server is listening on. ' - 'Default value is: 389, use 689 for LDAPS (SSL)'), + 'Default value is: 389, use 636 for LDAPS (SSL)'), preparer=strip_whitespace, title=_('Port'), validator=colander.Range(min=0, max=65536),