From: Ryan Tandy <ryan@nardis.ca>
Date: Sat, 25 Jun 2016 01:14:17 +0000 (-0700)
Subject: ITS#8099 bindconf ciphersuite setting is 'tls_cipher_suite'
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e35deef1107beb212f3c17602babc270df89c528;p=openldap

ITS#8099 bindconf ciphersuite setting is 'tls_cipher_suite'
---

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 9a20cf13e2..fe4a86cfe6 100644
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -562,7 +562,7 @@ H4: olcSyncrepl
 >		[tls_cacert=<file>]
 >		[tls_cacertdir=<path>]
 >		[tls_reqcert=never|allow|try|demand]
->		[tls_ciphersuite=<ciphers>]
+>		[tls_cipher_suite=<ciphers>]
 >		[tls_crlcheck=none|peer|all]
 >		[logbase=<base DN>]
 >		[logfilter=<filter str>]
diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 544f56b083..0ba13b58ff 100644
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -413,7 +413,7 @@ H4: syncrepl
 >		[tls_cacert=<file>]
 >		[tls_cacertdir=<path>]
 >		[tls_reqcert=never|allow|try|demand]
->		[tls_ciphersuite=<ciphers>]
+>		[tls_cipher_suite=<ciphers>]
 >		[tls_crlcheck=none|peer|all]
 >		[logbase=<base DN>]
 >		[logfilter=<filter str>]
diff --git a/doc/man/man5/slapd-asyncmeta.5 b/doc/man/man5/slapd-asyncmeta.5
index 20f986a151..26b7e29a11 100644
--- a/doc/man/man5/slapd-asyncmeta.5
+++ b/doc/man/man5/slapd-asyncmeta.5
@@ -319,7 +319,7 @@ for details on the syntax of this field.
 .B [tls_cacert=<file>]
 .B [tls_cacertdir=<path>]
 .B [tls_reqcert=never|allow|try|demand]
-.B [tls_ciphersuite=<ciphers>]
+.B [tls_cipher_suite=<ciphers>]
 .B [tls_protocol_min=<major>[.<minor>]]
 .B [tls_crlcheck=none|peer|all]
 Allows to define the parameters of the authentication method that is