ITS#8099 bindconf ciphersuite setting is 'tls_cipher_suite'

[openldap] / doc / guide / admin / slapdconf2.sdf

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 89d106c9e45f1cff8bc869ea4c19c9e574731c6b..fe4a86cfe6f7059d510603c3c7fb3b7d18d5dfef 100644 (file)
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 2005-2014 The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2005-2016 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Configuring slapd
@@ -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>]
@@ -669,10 +669,8 @@ The {{EX:starttls}} parameter specifies use of the StartTLS extended
 operation to establish a TLS session before authenticating to the provider.
 If the {{EX:critical}} argument is supplied, the session will be aborted
 if the StartTLS request fails.  Otherwise the syncrepl session continues
-without TLS.  Note that the main slapd TLS settings are not used by the
-syncrepl engine; by default the TLS parameters from a {{ldap.conf}}(5)
-configuration file will be used.  TLS settings may be specified here,
-in which case any {{ldap.conf}}(5) settings will be completely ignored.
+without TLS.  The tls_reqcert setting defaults to {{EX:"demand"}} and the
+other TLS settings default to the same as the main slapd TLS settings.
 
 Rather than replicating whole entries, the consumer can query logs
 of data modifications.  This mode of operation is referred to as