diff --git a/CHANGES b/CHANGES index c4d436a342cd73790d398478196e966a7110fc8f..b2ea10b35ff4516e5ded3fba134331a1f9f93dcf 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,7 @@ OpenLDAP 2.4.16 Engineering Fixed slapo-accesslog interaction with ppolicy (ITS#5979) Documentation admin24 clarified MMR URI requirements (ITS#5942,ITS#5987) + slapd-ldap/meta(5) added missing TLS options (ITS#5989) OpenLDAP 2.4.15 Release (2009/02/24) Fixed libldap alias dereferencing in C API again (ITS#5916) diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5 index 44e9f7e1969afe19a0fc0847a77d35378e71cfa3..4938206730b648315873b6a7fe5dc1771997f941 100644 --- a/doc/man/man5/slapd-ldap.5 +++ b/doc/man/man5/slapd-ldap.5 @@ -107,12 +107,14 @@ needs be created. .B bindmethod=simple|sasl [binddn=<simple DN>] [credentials=<simple password>] .B [saslmech=<SASL mech>] [secprops=<properties>] [realm=<realm>] .B [authcId=<authentication ID>] [authzId=<authorization ID>] +.B [starttls=no|yes|critical] .B [tls_cert=<file>] .B [tls_key=<file>] .B [tls_cacert=<file>] .B [tls_cacertdir=<path>] .B [tls_reqcert=never|allow|try|demand] .B [tls_ciphersuite=<ciphers>] +.B [tls_protocol_min=<version>] .B [tls_crlcheck=none|peer|all] .RS Allows to define the parameters of the authentication method that is @@ -217,12 +219,14 @@ for details on the syntax of this field. .B [saslmech=<SASL mech>] [secprops=<properties>] [realm=<realm>] .B [authcId=<authentication ID>] [authzId=<authorization ID>] .B [authz={native|proxyauthz}] [mode=<mode>] [flags=<flags>] +.B [starttls=no|yes|critical] .B [tls_cert=<file>] .B [tls_key=<file>] .B [tls_cacert=<file>] .B [tls_cacertdir=<path>] .B [tls_reqcert=never|allow|try|demand] .B [tls_ciphersuite=<ciphers>] +.B [tls_protocol_min=<version>] .B [tls_crlcheck=none|peer|all] .RS Allows to define the parameters of the authentication method that is diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5 index db38500fa222c1779c965a7176def7d5ed3b5b76..e7d137dc9ac6429b7f511261e5556600bd61873c 100644 --- a/doc/man/man5/slapd-meta.5 +++ b/doc/man/man5/slapd-meta.5 @@ -340,12 +340,14 @@ for details on the syntax of this field. .B [saslmech=<SASL mech>] [secprops=<properties>] [realm=<realm>] .B [authcId=<authentication ID>] [authzId=<authorization ID>] .B [authz={native|proxyauthz}] [mode=<mode>] [flags=<flags>] +.B [starttls=no|yes|critical] .B [tls_cert=<file>] .B [tls_key=<file>] .B [tls_cacert=<file>] .B [tls_cacertdir=<path>] .B [tls_reqcert=never|allow|try|demand] .B [tls_ciphersuite=<ciphers>] +.B [tls_protocol_min=<version>] .B [tls_crlcheck=none|peer|all] .RS Allows to define the parameters of the authentication method that is