From 43a9856aa68e44473ef1dc9c67b92d4e9011795d Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 15 Dec 2006 01:36:18 +0000 Subject: [PATCH] ITS#4510 update. Update wording in slapd.conf.5 to match admin guide --- doc/guide/admin/slapdconf2.sdf | 7 +++++++ doc/man/man5/slapd.conf.5 | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf index 1869a05228..f1bcd28e6b 100644 --- a/doc/guide/admin/slapdconf2.sdf +++ b/doc/guide/admin/slapdconf2.sdf @@ -609,6 +609,7 @@ H4: olcSyncrepl > olcSyncrepl: rid= > provider=ldap[s]://[:port] +> [starttls=yes|critical] > [type=refreshOnly|refreshAndPersist] > [interval=dd:hh:mm:ss] > [retry=[ <# of retries>]+] @@ -658,6 +659,12 @@ specification is located at the provider site. {{EX:syncrepl}} and {{EX:replica}} directives define two independent replication mechanisms. They do not represent the replication peers of each other. +The {{EX:starttls}} parameter specifies use of the StartTLS extended +operation to establish a TLS session before Binding to the provider. If the +StartTLS request fails and the {{EX:critical}} argument was used, the +session will be aborted. Otherwise the syncrepl session continues without +TLS. + The content of the syncrepl replica is defined using a search specification as its result set. The consumer slapd will send search requests to the provider slapd according to the search diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 6d106ad00e..d94393e614 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -1596,9 +1596,10 @@ The .B starttls parameter specifies use of the StartTLS extended operation to establish a TLS session before Binding to the provider. If the +StartTLS request fails and the .B critical -argument is supplied, the session will be aborted if the StartTLS request -fails. Otherwise the syncrepl session continues without TLS. +argument was used, the session will be aborted. Otherwise the syncrepl +session continues without TLS. A .B bindmethod of -- 2.47.2