From 4ee2ae8f94f2704438c728e0c0ddc10cfa2dfcf2 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 20 Dec 2005 00:39:41 +0000 Subject: [PATCH] StartTLS cleanup --- doc/man/man5/ldap.conf.5 | 2 +- doc/man/man5/slapd-ldap.5 | 6 +++--- doc/man/man5/slapd-meta.5 | 8 ++++---- doc/man/man5/slapd.conf.5 | 6 +++--- doc/man/man5/slapo-rwm.5 | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5 index af22fc7ff7..64c12fa319 100644 --- a/doc/man/man5/ldap.conf.5 +++ b/doc/man/man5/ldap.conf.5 @@ -206,7 +206,7 @@ If OpenLDAP is built with Transport Layer Security support, there are more options you can specify. These options are used when an .B ldaps:// URI is selected (by default or otherwise) or when the application -negotiates TLS by issuing the LDAP Start TLS operation. +negotiates TLS by issuing the LDAP StartTLS operation. .TP .B TLS_CACERT Specifies the file that contains certificates for all of the Certificate diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5 index a56e1a0926..3f62d0c37e 100644 --- a/doc/man/man5/slapd-ldap.5 +++ b/doc/man/man5/slapd-ldap.5 @@ -302,12 +302,12 @@ underlying libldap, with rebinding eventually performed if the .TP .B tls {[try-]start|[try-]propagate} -execute the start TLS extended operation when the connection is initialized; +execute the StartTLS extended operation when the connection is initialized; only works if the URI directive protocol scheme is not \fBldaps://\fP. -\fBpropagate\fP issues the Start TLS exop only if the original +\fBpropagate\fP issues the StartTLS operation only if the original connection did. The \fBtry-\fP prefix instructs the proxy to continue operations -if start TLS failed; its use is highly deprecated. +if the StartTLS operation failed; its use is highly deprecated. .TP .B t-f-support {NO|yes|discover} diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5 index 806f130f75..e9054bfe17 100644 --- a/doc/man/man5/slapd-meta.5 +++ b/doc/man/man5/slapd-meta.5 @@ -308,12 +308,12 @@ overridden by any per-target directive. .TP .B tls {[try-]start|[try-]propagate} -execute the start TLS extended operation when the connection is initialized; +execute the StartTLS extended operation when the connection is initialized; only works if the URI directive protocol scheme is not \fBldaps://\fP. -\fBpropagate\fP issues the Start TLS exop only if the original +\fBpropagate\fP issues the StartTLS operation only if the original connection did. The \fBtry-\fP prefix instructs the proxy to continue operations -if start TLS failed; its use is highly deprecated. +if the StartTLS operation failed; its use is highly deprecated. If set before any target specification, it affects all targets, unless overridden by any per-target directive. @@ -662,7 +662,7 @@ modifyAttrDN modify AVA modrDN modrdn newSuperiorDN modrdn deleteDN delete -exopPasswdDN passwd exop DN if proxy +exopPasswdDN password modify extended operation DN if proxy .fi .RE .LP diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index a552f4db8c..5b4890a9a5 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -411,10 +411,10 @@ disables acceptance of anonymous bind requests. .B bind_simple disables simple (bind) authentication. .B tls_2_anon -disables Start TLS from forcing session to anonymous status (see also -.BR tls_authc ). +disables forcing session to anonymous status (see also +.BR tls_authc ) upon StartTLS operation receipt. .B tls_authc -disables StartTLS if authenticated (see also +dissallow the StartTLS operation if authenticated (see also .BR tls_2_anon ). .HP .hy 0 diff --git a/doc/man/man5/slapo-rwm.5 b/doc/man/man5/slapo-rwm.5 index f2dd650f8b..3546b6b6e8 100644 --- a/doc/man/man5/slapo-rwm.5 +++ b/doc/man/man5/slapo-rwm.5 @@ -326,7 +326,7 @@ referralAttrDN add/modify DN portion of referrals modrDN modrdn newSuperiorDN modrdn deleteDN delete -exopPasswdDN passwd exop DN +exopPasswdDN password modify extended operation DN .fi .RE .LP -- 2.39.5