##// END OF EJS Templates
ldap: fixed ldaps port example to correct number.
marcink -
r4296:bdb5f3c6 default
parent child Browse files
Show More
@@ -68,7 +68,7 b' Below is example setup that can be used '
68 # Multiple servers can be specified using commas
68 # Multiple servers can be specified using commas
69
69
70 *option*: `port` => `389`
70 *option*: `port` => `389`
71 # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
71 # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
72
72
73 *option*: `timeout` => `300`
73 *option*: `timeout` => `300`
74 # Timeout for LDAP connection
74 # Timeout for LDAP connection
@@ -58,7 +58,7 b' Below is example setup that can be used '
58 # Multiple servers can be specified using commas
58 # Multiple servers can be specified using commas
59
59
60 *option*: `port` => `389`
60 *option*: `port` => `389`
61 # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
61 # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
62
62
63 *option*: `timeout` => `300`
63 *option*: `timeout` => `300`
64 # Timeout for LDAP connection
64 # Timeout for LDAP connection
@@ -22,7 +22,7 b' authentication::'
22 # Multiple servers can be specified using commas
22 # Multiple servers can be specified using commas
23
23
24 *option*: `port` => `389`
24 *option*: `port` => `389`
25 # Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
25 # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
26
26
27 *option*: `timeout` => `300`
27 *option*: `timeout` => `300`
28 # Timeout for LDAP connection
28 # Timeout for LDAP connection
@@ -85,7 +85,7 b' class AuthLdap(AuthLdapBase):'
85 self.TLS_KIND = tls_kind
85 self.TLS_KIND = tls_kind
86
86
87 if self.TLS_KIND == 'LDAPS':
87 if self.TLS_KIND == 'LDAPS':
88 port = port or 689
88 port = port or 636
89 self.ldap_server_type += 's'
89 self.ldap_server_type += 's'
90
90
91 OPT_X_TLS_DEMAND = 2
91 OPT_X_TLS_DEMAND = 2
@@ -249,7 +249,7 b' class LdapSettingsSchema(AuthnPluginSett'
249 colander.Int(),
249 colander.Int(),
250 default=389,
250 default=389,
251 description=_('Custom port that the LDAP server is listening on. '
251 description=_('Custom port that the LDAP server is listening on. '
252 'Default value is: 389, use 689 for LDAPS (SSL)'),
252 'Default value is: 389, use 636 for LDAPS (SSL)'),
253 preparer=strip_whitespace,
253 preparer=strip_whitespace,
254 title=_('Port'),
254 title=_('Port'),
255 validator=colander.Range(min=0, max=65536),
255 validator=colander.Range(min=0, max=65536),
General Comments 0
You need to be logged in to leave comments. Login now